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	Revert "Merge branch 'tc-info-version-check' into 'master'"	2018-02-21 16:54:56 +00:00
discussions	…
group	…
img	…
profile	…
project	Merge branch 'master' into 'issue_38337'	2018-03-06 16:28:54 +00:00
search	…
award_emojis.md	…
feature_highlight.md	…
index.md	…
markdown.md	Replace whitespace demonstrating line-breaks in GFM docs	2018-02-28 16:43:05 +00:00
permissions.md	…
reserved_names.md	…
snippets.md	…