forgejo/conf
Michael Boke ba1270df2d Merge remote-tracking branch 'upstream/master'
Conflicts:
	conf/app.ini
2014-10-03 22:51:07 +02:00
..
content Completely rule out the cgo 2014-03-17 11:56:50 -04:00
gitignore Removed trailing white spaces 2014-08-30 15:12:53 +02:00
license New UI merge in progress 2014-07-26 00:24:27 -04:00
locale Merge remote-tracking branch 'upstream/master' 2014-10-03 22:51:07 +02:00
app.ini Merge remote-tracking branch 'upstream/master' 2014-10-03 22:51:07 +02:00