kolaente 1bf3c47075 Merge branch 'master' of https://github.com/go-gitea/gitea into issue-due-date-api ... # Conflicts: # vendor/vendor.json		2018-06-08 13:01:44 +02:00
..
issue.go	Merge branch 'master' of https://github.com/go-gitea/gitea into issue-due-date-api	2018-06-08 13:01:44 +02:00
key.go	add simple descriptions for swagger validate (#4087)	2018-05-31 19:13:55 +08:00
misc.go	add simple descriptions for swagger validate (#4087)	2018-05-31 19:13:55 +08:00
options.go	Merge branch 'master' of https://github.com/go-gitea/gitea into issue-due-date-api	2018-06-08 13:01:44 +02:00
org.go	add simple descriptions for swagger validate (#4087)	2018-05-31 19:13:55 +08:00
repo.go	add simple descriptions for swagger validate (#4087)	2018-05-31 19:13:55 +08:00
user.go	add simple descriptions for swagger validate (#4087)	2018-05-31 19:13:55 +08:00