Zeger-Jan van de Weg 77d0de9102 Merge branch 'master' into 'zj-create-mattermost-team' ... # Conflicts: # db/schema.rb		2017-03-06 14:04:14 +00:00
..
client.rb	…
command.rb	…
error.rb	…
session.rb	…
team.rb	Merge branch 'master' into 'zj-create-mattermost-team'	2017-03-06 14:04:14 +00:00