diff options
author | Unknwon <u@gogs.io> | 2015-08-10 23:01:41 +0800 |
---|---|---|
committer | Unknwon <u@gogs.io> | 2015-08-10 23:01:41 +0800 |
commit | 887bc1b594ef5c279c28c90009e67b068978482f (patch) | |
tree | d4390bf5b8a6b4f581fc322a3290e69315060b78 /config.codekit | |
parent | 884bc4ffd81f5b952df172d43ba7b16e1844ff19 (diff) | |
parent | 2aea247208d4429d111fb9725c16a8e9ea24860f (diff) | |
download | gitea-887bc1b594ef5c279c28c90009e67b068978482f.tar.gz gitea-887bc1b594ef5c279c28c90009e67b068978482f.zip |
Merge branch 'develop' of github.com:gogits/gogs into feature/pull_request2
# Conflicts:
# modules/bindata/bindata.go
# public/css/gogs.min.css
Diffstat (limited to 'config.codekit')
-rw-r--r-- | config.codekit | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/config.codekit b/config.codekit index bd38125bd8..f24f204f80 100644 --- a/config.codekit +++ b/config.codekit @@ -122,15 +122,6 @@ "outputPathIsOutsideProject": 0, "outputPathIsSetByUser": 0 }, - "\/public\/css\/gogs.min.css": { - "fileType": 16, - "ignore": 1, - "ignoreWasSetByUser": 0, - "inputAbbreviatedPath": "\/public\/css\/gogs.min.css", - "outputAbbreviatedPath": "No Output Path", - "outputPathIsOutsideProject": 0, - "outputPathIsSetByUser": 0 - }, "\/public\/css\/jquery.datetimepicker.css": { "fileType": 16, "ignore": 0, @@ -308,26 +299,6 @@ "outputPathIsSetByUser": 0, "processed": 1 }, - "\/public\/less\/_base.less": { - "allowInsecureImports": 0, - "createSourceMap": 0, - "disableJavascript": 0, - "fileType": 1, - "ieCompatibility": 1, - "ignore": 1, - "ignoreWasSetByUser": 0, - "inputAbbreviatedPath": "\/public\/less\/_base.less", - "outputAbbreviatedPath": "\/public\/css\/_base.css", - "outputPathIsOutsideProject": 0, - "outputPathIsSetByUser": 0, - "outputStyle": 0, - "relativeURLS": 0, - "shouldRunAutoprefixer": 0, - "shouldRunBless": 0, - "strictImports": 0, - "strictMath": 0, - "strictUnits": 0 - }, "\/public\/less\/_form.less": { "allowInsecureImports": 0, "createSourceMap": 0, |