domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Merge branch 'develop' of github.com:gogits/gogs into feature/milestone

Browse source 
# Conflicts:
#	gogs.go
#	models/issue.go
#	templates/.VERSION
This commit is contained in:
Unknwon 2015-08-05 20:26:00 +08:00
commit 2c507667bf
25 changed files with 242 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

11
config.codekit
View file

@ -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,