Merge branch 'CoryChaplin-feature_user_count' into development
authorDarren <darren@darrenwhitlen.com>
Thu, 29 May 2014 20:55:41 +0000 (21:55 +0100)
committerDarren <darren@darrenwhitlen.com>
Thu, 29 May 2014 20:55:41 +0000 (21:55 +0100)
commit04d088c73e2f2a90cd32d6138f6dcc608b081a78
treedbc8e744f366e55d2b1895eabb69cec4e1b07481
parent7381bf9fc683c9f41c436b29f7516a9241fb5ea7
parent4ad632579a96e97a8ecef8e8c572e16534b2144a
Merge branch 'CoryChaplin-feature_user_count' into development

Conflicts:
client/assets/themes/relaxed/style.css
client/assets/css/style.css
client/assets/themes/relaxed/style.css