-
- Downloads
Merge branch 'master' into master
Showing
- app/views/accounts/show.atom.ruby 0 additions, 27 deletionsapp/views/accounts/show.atom.ruby
- app/views/layouts/application.html.haml 4 additions, 2 deletionsapp/views/layouts/application.html.haml
- app/views/oauth/authorized_applications/index.html.haml 0 additions, 0 deletionsapp/views/oauth/authorized_applications/index.html.haml
- app/views/stream_entries/_status.html.haml 1 addition, 1 deletionapp/views/stream_entries/_status.html.haml
- app/views/stream_entries/show.atom.ruby 0 additions, 9 deletionsapp/views/stream_entries/show.atom.ruby
- app/views/user_mailer/confirmation_instructions.fi.html.erb 5 additions, 0 deletionsapp/views/user_mailer/confirmation_instructions.fi.html.erb
- app/views/user_mailer/confirmation_instructions.fi.text.erb 5 additions, 0 deletionsapp/views/user_mailer/confirmation_instructions.fi.text.erb
- app/views/user_mailer/password_change.fi.html.erb 3 additions, 0 deletionsapp/views/user_mailer/password_change.fi.html.erb
- app/views/user_mailer/password_change.fi.text.erb 3 additions, 0 deletionsapp/views/user_mailer/password_change.fi.text.erb
- app/views/user_mailer/reset_password_instructions.fi.html.erb 8 additions, 0 deletions...views/user_mailer/reset_password_instructions.fi.html.erb
- app/views/user_mailer/reset_password_instructions.fi.text.erb 8 additions, 0 deletions...views/user_mailer/reset_password_instructions.fi.text.erb
- app/workers/admin/suspension_worker.rb 2 additions, 0 deletionsapp/workers/admin/suspension_worker.rb
- app/workers/application_worker.rb 2 additions, 0 deletionsapp/workers/application_worker.rb
- app/workers/distribution_worker.rb 1 addition, 4 deletionsapp/workers/distribution_worker.rb
- app/workers/import_worker.rb 1 addition, 1 deletionapp/workers/import_worker.rb
- app/workers/pubsubhubbub/delivery_worker.rb 3 additions, 0 deletionsapp/workers/pubsubhubbub/delivery_worker.rb
- app/workers/pubsubhubbub/distribution_worker.rb 2 additions, 6 deletionsapp/workers/pubsubhubbub/distribution_worker.rb
- app/workers/remote_profile_update_worker.rb 20 additions, 0 deletionsapp/workers/remote_profile_update_worker.rb
- app/workers/salmon_worker.rb 1 addition, 1 deletionapp/workers/salmon_worker.rb
- config/locales/en.yml 4 additions, 0 deletionsconfig/locales/en.yml
app/views/accounts/show.atom.ruby
deleted
100644 → 0
File moved
app/workers/remote_profile_update_worker.rb
0 → 100644
Please register or sign in to comment