kolaente c0cd0c3710 Merge branch 'master' of https://github.com/go-gitea/gitea ... # Conflicts: # options/locale/locale_en-US.ini		2018-04-29 11:25:56 +02:00
..
admin	Add admin dashboard option to run health checks (#3606)	2018-03-02 11:09:43 +02:00
api/v1	Merge branch 'master' of https://github.com/go-gitea/gitea	2018-04-29 11:25:56 +02:00
dev	Make time diff translatable (#2057)	2017-06-28 13:43:28 +08:00
org	Address issues pointed out by @lunny in #3339 (#3352)	2018-01-12 08:37:30 -06:00
private	improve protected branch to add whitelist support (#2451)	2017-09-14 16:16:22 +08:00
repo	Merge branch 'master' of https://github.com/go-gitea/gitea	2018-04-29 11:25:56 +02:00
routes	Merge branch 'master' of https://github.com/go-gitea/gitea	2018-04-13 15:11:47 +02:00
user	Refactor and simplify redirect to url (#3674)	2018-03-15 22:13:34 +01:00
utils	Allow adding collaborators with (fullname) (#3103)	2017-12-07 15:00:09 +08:00
home.go	Global code search support (#3664)	2018-03-16 22:04:33 +08:00
init.go	Store OAuth2 session data in database (#3660)	2018-04-29 09:09:24 +03:00
install.go	Implements generator cli for secrets (#3531)	2018-02-18 20:14:37 +02:00