Riley Davis 37dad96fee Merge branch 'master' ...

Conflicts:
	client/coral-admin/src/containers/Configure/StreamSettings.js

2017-03-07 11:23:22 -07:00

..

Configure.css

indention

2017-03-06 14:06:32 -07:00

Configure.js

removing dead code

2017-03-01 15:28:44 -07:00

Domainlist.js

Configure UX Style Polish!

2017-03-06 12:12:26 -05:00

EmbedLink.js

Configure UX Style Polish!

2017-03-06 12:12:26 -05:00

ModerationSettings.js

Configure UX Style Polish!

2017-03-06 12:12:26 -05:00

StreamSettings.js

Merge branch 'master'

2017-03-07 11:23:22 -07:00

TechSettings.js

indention

2017-03-06 14:06:32 -07:00

Wordlist.js

Configure UX Style Polish!

2017-03-06 12:12:26 -05:00