Unknwon 3f38ff6c09 Merge branch 'dev' of github.com:gogits/gogs into dev ... Conflicts: templates/status/500.tmpl		2014-07-26 00:25:43 -04:00
..
admin
base
mail
ng/base	New UI merge in progress	2014-07-26 00:24:27 -04:00
org
repo	New UI merge in progress	2014-07-26 00:24:27 -04:00
status	Merge branch 'dev' of github.com:gogits/gogs into dev	2014-07-26 00:25:43 -04:00
user	New UI merge in progress	2014-07-26 00:24:27 -04:00
.VERSION	New UI merge in progress	2014-07-26 00:24:27 -04:00
home.tmpl	New UI merge in progress	2014-07-26 00:24:27 -04:00
install.tmpl