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	Merge branch 'master' into zj-create-mattermost-team	2017-03-02 10:22:56 +01:00
command.rb	Small update to the Mattermost API	2017-01-24 11:30:47 +01:00
error.rb	Enable and autocorrect the CustomErrorClass cop	2017-03-01 15:28:10 +00:00
session.rb	Merge branch 'master' into zj-create-mattermost-team	2017-03-02 10:22:56 +01:00
team.rb	Merge branch 'master' into 'zj-create-mattermost-team'	2017-03-06 14:04:14 +00:00