Merge branch 'master' into french-translation
Showing
- app/controllers/api/v1/accounts_controller.rb 1 addition, 1 deletionapp/controllers/api/v1/accounts_controller.rb
- app/controllers/api/v1/notifications_controller.rb 1 addition, 1 deletionapp/controllers/api/v1/notifications_controller.rb
- app/controllers/api/v1/timelines_controller.rb 1 addition, 1 deletionapp/controllers/api/v1/timelines_controller.rb
- app/controllers/settings/preferences_controller.rb 5 additions, 2 deletionsapp/controllers/settings/preferences_controller.rb
- app/lib/feed_manager.rb 15 additions, 11 deletionsapp/lib/feed_manager.rb
- app/models/account.rb 2 additions, 2 deletionsapp/models/account.rb
- app/models/user.rb 1 addition, 0 deletionsapp/models/user.rb
- app/services/notify_service.rb 2 additions, 0 deletionsapp/services/notify_service.rb
- app/views/settings/preferences/show.html.haml 4 additions, 0 deletionsapp/views/settings/preferences/show.html.haml
- config/i18n-tasks.yml 0 additions, 3 deletionsconfig/i18n-tasks.yml
- config/locales/simple_form.de.yml 3 additions, 0 deletionsconfig/locales/simple_form.de.yml
- config/locales/simple_form.en.yml 3 additions, 0 deletionsconfig/locales/simple_form.en.yml
Loading
Please register or sign in to comment