Bumping development (back) to version 1.1.7
Merge remote branch 'origin/qa' into develop
Merge branch 'develop' of github.com:patrickdemond/mastodon into develop
Merge remote branch 'origin/qa' into develop
Merge branch 'develop' of github.com:patrickdemond/mastodon into develop
Updating all reports to new cache system
Sabretooth/Beartooth now include email
Merge remote branch 'origin/develop' into qa
Merge remote branch 'origin/release' into qa
Merge remote branch 'origin/release' into develop
Merge remote branch 'origin/release' into develop
Merge remote branch 'origin/develop' into qa
Merge remote branch 'origin/qa' into develop
Bumping development to version 1.1.8
Merge remote branch 'origin/qa' into release
Merge remote branch 'origin/release' into develop
Tweaking report formats
Tweaking reports
Fixing bug in user_new_access push (typist role not propagated to other apps)
Merge remote branch 'origin/release' into develop