Jonas Franz 6d00c1a7ce Merge branch 'master' into feat/approval-new ... # Conflicts: # models/issue_comment.go # models/migrations/migrations.go # models/migrations/v64.go # models/models.go # public/css/index.css		2018-05-13 22:14:34 +02:00
..
admin	Add option to use paged LDAP search when synchronizing users (#3895)	2018-05-05 17:30:47 +03:00
api/v1	Multiple assignees (#3705)	2018-05-09 19:29:04 +03: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' into feat/approval-new	2018-05-13 22:14:34 +02:00
routes	Implement Review form	2018-05-11 12:50:44 +02:00
user	issue-2768: added new option allow_only_external_registration (#3910)	2018-05-13 15:51:16 +08: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	Improved comment rendering in "Files" view by adding Comments to DiffLine	2018-05-12 19:09:42 +02:00
install.go	issue-2768: added new option allow_only_external_registration (#3910)	2018-05-13 15:51:16 +08:00