]> source.dussan.org Git - gitea.git/commit
Merge branch 'master' of github.com:gogits/gogs
authorslene <vslene@gmail.com>
Thu, 20 Mar 2014 13:02:52 +0000 (21:02 +0800)
committerslene <vslene@gmail.com>
Thu, 20 Mar 2014 13:02:52 +0000 (21:02 +0800)
commitc6bd723ce17ae3c0495f84e46a9296b30db5aee1
treea2153db027aa03db50f2e7f841bd2545fa65a2bd
parent21379e30a18fed473ae2bbeb41332919ff80497d
parentc7b6fbfd46fe465b5103ecc0b743ea009eb1e586
Merge branch 'master' of github.com:gogits/gogs

Conflicts:
public/js/app.js
public/css/gogs.css
public/js/app.js
routers/repo/single.go