lianguan/gitea
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki 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
parent 0705f55ce0 b9527cd1bf
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,