diff options
| author | Unknwon <u@gogs.io> | 2015-08-05 20:26:00 +0800 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-08-05 20:26:00 +0800 |
| commit | 2c507667bfd17f88dc4bfabc426c74cd5f8e4461 (patch) | |
| tree | 31b267331f84d45a92f6a0bfe7eaafa124f4578f /config.codekit | |
| parent | 0705f55ce097b9892a7c4c11faa5396c4e557232 (diff) | |
| parent | b9527cd1bfabcce3be62b43f0c199b1418519549 (diff) | |
| download | gitea-2c507667bfd17f88dc4bfabc426c74cd5f8e4461.tar.gz gitea-2c507667bfd17f88dc4bfabc426c74cd5f8e4461.zip | |
Merge branch 'develop' of github.com:gogits/gogs into feature/milestone
# Conflicts:
# gogs.go
# models/issue.go
# templates/.VERSION
Diffstat (limited to 'config.codekit')
| -rw-r--r-- | config.codekit | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/config.codekit b/config.codekit index 120180d3be..a9662e0e39 100644 --- a/config.codekit +++ b/config.codekit @@ -493,17 +493,6 @@ "outputPathIsOutsideProject": 0, "outputPathIsSetByUser": 0 }, - "\/public\/ng\/js\/gogs.js": { - "fileType": 64, - "ignore": 0, - "ignoreWasSetByUser": 0, - "inputAbbreviatedPath": "\/public\/ng\/js\/gogs.js", - "outputAbbreviatedPath": "\/public\/ng\/js\/min\/gogs-min.js", - "outputPathIsOutsideProject": 0, - "outputPathIsSetByUser": 0, - "outputStyle": 1, - "syntaxCheckerStyle": 1 - }, "\/public\/ng\/js\/gogs\/issue_label.js": { "fileType": 64, "ignore": 1, |