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
..
api_org.go	Golint fixed for modules/context	2016-11-25 14:53:59 +08:00
api.go	Resolved Conflicts	2017-09-12 14:19:20 +02:00
auth.go	Golint fixed for modules/setting (#262)	2016-11-27 18:14:25 +08:00
context.go	Refactor and simplify redirect to url (#3674)	2018-03-15 22:13:34 +01:00
org.go	Handle refactor (#3339)	2018-01-10 23:34:17 +02:00
repo.go	Merge branch 'master' of https://github.com/go-gitea/gitea	2018-05-09 18:34:09 +02:00