Richard Mahn 6aa7e46b21 Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file ...

Conflicts:
	modules/bindata/bindata.go
	modules/setting/setting.go

2016-07-28 17:13:43 -06:00

..

miniwinsvc.go

fix #2189

2015-12-18 05:49:28 -05:00

setting.go

Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file

2016-07-28 17:13:43 -06:00