mirror of
https://github.com/codeninjasllc/discourse.git
synced 2024-12-12 00:31:48 -05:00
007118b00c
Conflicts: config/locales/server.en.yml db/structure.sql spec/views/omniauth_callbacks/complete.html.erb_spec.rb |
||
---|---|---|
.. | ||
complete.html.erb_spec.rb | ||
failure.html.erb_spec.rb |