summaryrefslogtreecommitdiffstats
path: root/web/react/components/user_settings/user_settings_modal.jsx
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into PLT-11-email=Corey Hulen2015-09-231-1/+1
|\
| * Implement UI theme colors.JoramWilander2015-09-231-1/+1
* | Fixing merge conflict=Corey Hulen2015-09-221-1/+1
|/
* Implement incoming webhooks.JoramWilander2015-09-211-0/+96