Minor added json 1.8 support
Merge branch 'feature/multiparty' into develop
Merge branch 'develop' of github.com:Tout/trubl into develop
Merge remote-tracking branch 'origin/master' into develop
no ticket - cleanup of random artifacts, removal of load test supporting files
QA-109 - adding the me/settings endpoint call and test
yard removal broke travis, try to fix
QA-29 - duh, include the fixture
QA-109 - use a hashie based settings class
QA-105 - adding some endpoints and tests
QA-105 - adding some endpoints and tests
QA-105 - adding some endpoints and tests - don't forget the files
QA-105 - adding notification inbox
QA-105 - adding metrics endpoints and tests
working around safe_yaml dependency issue https://github.com/dtao/safe_yaml/issues/43
Merge branch 'develop' of github.com:Tout/trubl into develop
Bump the version number
bumping the version number
Merge branch 'develop' of github.com:Tout/trubl into develop
QA-114 - stubbing methods for me objects