007118b00c
Conflicts: config/locales/server.en.yml db/structure.sql spec/views/omniauth_callbacks/complete.html.erb_spec.rb |
||
---|---|---|
.. | ||
AUTHORS.md | ||
CONTRIBUTING.md | ||
DEVELOPER-ADVANCED.md | ||
INSTALL.md | ||
PLUGINS.md | ||
SOFTWARE.md | ||
TESTING.md | ||
VAGRANT.md |