kolaente 172b1f054a Merge branch 'master' of https://github.com/go-gitea/gitea ... # Conflicts: # models/migrations/v51.go		2017-12-19 19:07:30 +01: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	Add reactions to issues/PR and comments (#2856)	2017-12-04 01:14:26 +02:00
org.go	Golint fixed for modules/setting (#262)	2016-11-27 18:14:25 +08:00
repo.go	Merge branch 'master' of https://github.com/go-gitea/gitea	2017-12-19 19:07:30 +01:00