Felipe Artur e77c4e9efe Merge branch 'master' into 'issue_38337' ... # Conflicts: # app/models/group.rb # db/schema.rb		2018-03-06 16:28:54 +00:00
..
unreleased	Merge branch 'master' into 'issue_38337'	2018-03-06 16:28:54 +00:00
unreleased-ee	Remove changelog item that already went into EE	2018-02-23 16:35:08 +01:00
archive.md	Archive changelogs for versions before 8.16	2018-01-22 11:17:40 -06:00