Unknwon 55ccb00a47 Merge branch 'develop' of https://github.com/SergioBenitez/gogs into develop ... # Conflicts: # modules/bindata/bindata.go		2015-08-16 14:31:54 +08:00
..
bindata.go	Merge branch 'develop' of https://github.com/SergioBenitez/gogs into develop	2015-08-16 14:31:54 +08:00