diff options
| author | Unknwon <u@gogs.io> | 2015-08-12 19:10:16 +0800 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-08-12 19:10:16 +0800 |
| commit | a01867cc1accdb9dbe9c7027abb34ebcc30c50ee (patch) | |
| tree | 4668592462966e1bf636486bcf5beed56e4c58b2 /conf | |
| parent | ab2d0b3b442a2dc9ad0197f6e97760f5dd6148d6 (diff) | |
| parent | 33f33e055afe08a7d497345d67f8b8b46c498379 (diff) | |
| download | gitea-a01867cc1accdb9dbe9c7027abb34ebcc30c50ee.tar.gz gitea-a01867cc1accdb9dbe9c7027abb34ebcc30c50ee.zip | |
Merge branch 'develop' of github.com:gogits/gogs into feature/pull_request2
# Conflicts:
# public/css/gogs.min.css
Diffstat (limited to 'conf')
0 files changed, 0 insertions, 0 deletions