James Edwards-Jones b988faaf85 Merge branch 'master' into 'jej-pages-to-ce' ... # Conflicts: # db/schema.rb		2017-02-06 15:12:27 +00:00
..
dashboard	…
explore	…
group	…
profile	…
project	Merge branch 'master' into 'jej-pages-to-ce'	2017-02-06 15:12:27 +00:00
shared	Merge branch 'master' into jej-pages-picked-from-ee	2017-02-03 17:25:26 +00:00
snippets	…
groups.rb	…
invites.rb	…
search.rb	…
user.rb	…