Commit 7d89cae45d7aa16750574d49a0a363a5c92556f2
Exists in
production
Merge branch 'staging' into production
Conflicts: app/models/session.rb
Showing
1 changed file
with
2 additions
and
1 deletions
Show diff stats
app/models/session.rb