=Corey Hulen 6e60768abe Fixing merge conflict

2015-09-22 13:18:42 -07:00

..

0.5

Updating dockerfile for 0.6.0-rc1. Moving docker files into versioned directories.

2015-07-31 15:51:36 -04:00

0.6

Fix coding style: replace tab with whitespace in mattermost config

2015-09-13 08:02:53 +08:00

0.7

Fix coding style: replace tab with whitespace in mattermost config

2015-09-13 08:02:53 +08:00

dev

Fixing merge conflict

2015-09-22 13:18:42 -07:00

local

Fixing merge conflict

2015-09-22 13:18:42 -07:00