Neil Lalonde 01b6bc08ba Merge fixes from master

2016-04-07 13:51:05 -04:00

..

components

merge master

2016-03-31 17:40:54 -04:00

controllers

Merge fixes from master

2016-04-07 13:51:05 -04:00

fabricators

merge master

2016-03-31 17:40:54 -04:00

fixtures

merge master

2016-03-31 17:40:54 -04:00

helpers

merge master

2016-03-31 17:40:54 -04:00

integration

merge master

2016-03-31 17:40:54 -04:00

integrity

merge master

2016-03-31 17:40:54 -04:00

jobs

merge master

2016-03-31 17:40:54 -04:00

mailers

merge master

2016-03-31 17:40:54 -04:00

models

Remove UserFirst for mention since it can be retrieved elsewhere

2016-04-06 14:01:37 -04:00

phantom_js

merge master

2016-03-31 17:40:54 -04:00

serializers

merge master

2016-03-31 17:40:54 -04:00

services

merge master

2016-03-31 17:40:54 -04:00

support

merge master

2016-03-31 17:40:54 -04:00

views/omniauth_callbacks

merge master

2016-03-31 17:40:54 -04:00

rails_helper.rb

merge master

2016-03-31 17:40:54 -04:00