Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | fix merging issues | 2017-11-10 | |
| | |||
* | Merge branch 'develop' into feature/mute-service | 2017-11-10 | |
|\ | | | | | | | | | | | | | | | # Conflicts: # src/components/services/content/ServiceWebview.js # src/components/services/content/Services.js # src/components/services/tabs/TabItem.js # src/containers/layout/AppLayoutContainer.js | ||
| * | feat(Service): Add option to display disabled services in tabs | 2017-11-09 | |
| | | |||
* | | feat(App): Add option to mute all services in sidebar | 2017-11-10 | |
|/ | | | | Closes #8 #162 | ||
* | initial commit | 2017-10-13 | |