Conflicts: config/locales/server.en.yml db/structure.sql spec/views/omniauth_callbacks/complete.html.erb_spec.rb |
||
|---|---|---|
| .. | ||
| fixtures | ||
| migrate | ||
| seeds.rb | ||
| structure.sql | ||
Conflicts: config/locales/server.en.yml db/structure.sql spec/views/omniauth_callbacks/complete.html.erb_spec.rb |
||
|---|---|---|
| .. | ||
| fixtures | ||
| migrate | ||
| seeds.rb | ||
| structure.sql | ||