Richard Mahn 6aa7e46b21 Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file ...

Conflicts:
	modules/bindata/bindata.go
	modules/setting/setting.go

2016-07-28 17:13:43 -06:00

..

auth

Use SecurityProtocol to replace UseSSL in LDAP config

2016-07-08 07:25:09 +08:00

base

Refactor User.Id to User.ID

2016-07-24 01:08:22 +08:00

org

Refactor User.Id to User.ID

2016-07-24 01:08:22 +08:00

repo

Minor HTML fix for delete repository notice

2016-07-23 20:42:46 +08:00

user

Refactor User.Id to User.ID

2016-07-24 01:08:22 +08:00

config.tmpl

#1891 attempt to fix expected invalid CSRF token

2016-03-03 15:09:43 -05:00

dashboard.tmpl

Update for Edit

2016-07-19 16:12:57 -06:00

monitor.tmpl

Indent all templates with tabs

2015-12-08 00:57:46 +01:00

nav.tmpl

Indent all templates with tabs

2015-12-08 00:57:46 +01:00

navbar.tmpl

Indent all templates with tabs

2015-12-08 00:57:46 +01:00

notice.tmpl

Indent all templates with tabs

2015-12-08 00:57:46 +01:00