kolaente 67f66d6bb5 Resolved Conflicts ... Signed-off-by: Konrad <konrad@kola-entertainments.de>		2017-09-12 14:19:20 +02:00
..
hook.go	Resolved Conflicts	2017-09-12 14:19:20 +02:00
member.go	Resolved Conflicts	2017-09-12 14:19:20 +02:00
org.go	Resolved Conflicts	2017-09-12 14:19:20 +02:00
team.go	Refactor and fix incorrect comment (#1247)	2017-03-15 08:51:46 +08:00