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
..
account	…
admin_area	…
discussions	…
group	…
img	…
profile	…
project	…
search	…
award_emojis.md	…
feature_highlight.md	…
index.md	…
markdown.md	…
permissions.md	…
reserved_names.md	…
snippets.md	…