Unknwon 55ccb00a47 Merge branch 'develop' of https://github.com/SergioBenitez/gogs into develop ... # Conflicts: # modules/bindata/bindata.go		2015-08-16 14:31:54 +08:00
..
apiv1	…
ldap	…
pam	…
admin.go	…
auth.go	…
auth_form.go	…
org.go	…
repo_form.go	…
user_form.go	…