kolaente 288cd40402 Merge branch 'master' of https://github.com/go-gitea/gitea ... # Conflicts: # models/issue_comment.go # models/migrations/migrations.go # models/migrations/v64.go		2018-05-09 18:34:09 +02:00
..
admin	Cleanup models.User.HashPassword (#3334)	2018-01-12 00:19:38 +02:00
convert	Populate URL field of API commits (#3546)	2018-02-20 20:50:42 +08:00
misc	Rework special link parsing in the post-processing of markup (#3354)	2018-02-27 09:09:18 +02:00
org	don't reset team/repo count when updating team via API (#3831)	2018-04-29 13:22:57 +08:00
repo	Merge branch 'master' of https://github.com/go-gitea/gitea	2018-05-09 18:34:09 +02:00
swagger	Add Attachment API (#3478)	2018-03-06 09:22:16 +08:00
user	Refactor struct's time to remove unnecessary memory usage (#3142)	2017-12-11 06:37:04 +02:00
utils	Fix API status code for hook creation (#2814)	2017-11-20 15:00:53 +08:00
api.go	API endpoint for testing webhook (#3550)	2018-04-29 14:21:33 +08:00