=Corey Hulen 7f3bfdbe0c Fixing merge

2015-09-23 14:38:34 -07:00

..

components

Fixing merge

2015-09-23 14:38:34 -07:00

dispatcher

Cosmetic reformatting of multiple jsx files

2015-09-02 08:30:23 -07:00

pages

Merge branch 'master' into PLT-11-email

2015-09-23 12:55:58 -07:00

stores

Fixing merge

2015-09-23 14:38:34 -07:00

utils

Fixing merge

2015-09-23 14:38:34 -07:00

.eslintrc

New add channel modal using react-bootstrap.

2015-09-14 13:56:58 -04:00

package.json

Implement UI theme colors.

2015-09-23 10:12:40 -04:00