Justin Nuß 91480f3791 Merge branch 'dev' of https://github.com/gogits/Gogs into issue/281 ... Conflicts: modules/base/tool.go		2014-07-26 11:23:58 +02:00
..
base.go	New UI merge in progress	2014-07-26 00:24:27 -04:00
markdown.go	Fix #138	2014-05-12 19:32:35 -04:00
template.go	Huge updates!!!!! Be careful to merge!!!!	2014-07-26 02:28:04 -04:00
tool.go	Merge branch 'dev' of https://github.com/gogits/Gogs into issue/281	2014-07-26 11:23:58 +02:00