kolaente b63232fef2 Merge remote-tracking branch 'upstream/master' into issue-due-date-api ... # Conflicts: # public/css/index.css # public/swagger.v1.json # routers/api/v1/swagger/options.go		2018-06-13 10:29:07 +02:00
..
admin	LDAP Public SSH Keys synchronization (#1844)	2018-05-24 07:59:02 +03:00
api/v1	Merge remote-tracking branch 'upstream/master' into issue-due-date-api	2018-06-13 10:29:07 +02:00
dev	Make time diff translatable (#2057)	2017-06-28 13:43:28 +08:00
org	Splitted the user settings code into several files to be more maintainable (#3968)	2018-05-17 12:05:00 +08:00
private	improve protected branch to add whitelist support (#2451)	2017-09-14 16:16:22 +08:00
repo	Merge remote-tracking branch 'upstream/master' into issue-due-date-api	2018-06-12 08:36:45 +02:00
routes	Merge branch 'master' of https://github.com/go-gitea/gitea into issue-due-date-api	2018-06-08 13:01:44 +02:00
user	LDAP Public SSH Keys synchronization (#1844)	2018-05-24 07:59:02 +03:00
utils	Allow adding collaborators with (fullname) (#3103)	2017-12-07 15:00:09 +08:00
home.go	Added repository search ordered by stars or forks. Forks column in admin repo list. (#3969)	2018-05-24 09:03:42 +08:00
init.go	Store OAuth2 session data in database (#3660)	2018-04-29 09:09:24 +03:00
install.go	issue-2768: added new option allow_only_external_registration (#3910)	2018-05-13 15:51:16 +08:00