007118b00c
Conflicts: config/locales/server.en.yml db/structure.sql spec/views/omniauth_callbacks/complete.html.erb_spec.rb |
||
---|---|---|
.. | ||
fonts | ||
images | ||
javascripts | ||
stylesheets |
007118b00c
Conflicts: config/locales/server.en.yml db/structure.sql spec/views/omniauth_callbacks/complete.html.erb_spec.rb |
||
---|---|---|
.. | ||
fonts | ||
images | ||
javascripts | ||
stylesheets |