-
- Téléchargements
Merge branch 'master' into debugger
Conflicts: Gemfile.lock
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Affichage de
- app/views/notifier/reshared.text.haml 0 ajout, 3 suppressionsapp/views/notifier/reshared.text.haml
- app/views/notifier/single_admin.html.haml 0 ajout, 8 suppressionsapp/views/notifier/single_admin.html.haml
- app/views/notifier/single_admin.markerb 7 ajouts, 0 suppressionapp/views/notifier/single_admin.markerb
- app/views/notifier/single_admin.text.haml 0 ajout, 6 suppressionsapp/views/notifier/single_admin.text.haml
- app/views/notifier/started_sharing.html.haml 0 ajout, 5 suppressionsapp/views/notifier/started_sharing.html.haml
- app/views/notifier/started_sharing.markerb 5 ajouts, 0 suppressionapp/views/notifier/started_sharing.markerb
- app/views/notifier/started_sharing.text.haml 0 ajout, 4 suppressionsapp/views/notifier/started_sharing.text.haml
- app/views/shared/_add_remove_services.haml 1 ajout, 1 suppressionapp/views/shared/_add_remove_services.haml
- config/application.yml.example 2 ajouts, 2 suppressionsconfig/application.yml.example
- config/environments/integration2.rb 0 ajout, 1 suppressionconfig/environments/integration2.rb
- config/initializers/omniauth.rb 1 ajout, 1 suppressionconfig/initializers/omniauth.rb
- config/initializers/resque.rb 2 ajouts, 2 suppressionsconfig/initializers/resque.rb
- config/locales/devise/devise.fa.yml 8 ajouts, 0 suppressionconfig/locales/devise/devise.fa.yml
- config/locales/devise/devise.nn.yml 3 ajouts, 1 suppressionconfig/locales/devise/devise.nn.yml
- config/locales/diaspora/ar.yml 0 ajout, 4 suppressionsconfig/locales/diaspora/ar.yml
- config/locales/diaspora/art-nvi.yml 0 ajout, 6 suppressionsconfig/locales/diaspora/art-nvi.yml
- config/locales/diaspora/bg.yml 0 ajout, 6 suppressionsconfig/locales/diaspora/bg.yml
- config/locales/diaspora/cs.yml 0 ajout, 2 suppressionsconfig/locales/diaspora/cs.yml
- config/locales/diaspora/da.yml 0 ajout, 6 suppressionsconfig/locales/diaspora/da.yml
- config/locales/diaspora/de.yml 0 ajout, 6 suppressionsconfig/locales/diaspora/de.yml
Chargement en cours
Veuillez vous inscrire ou vous se connecter pour commenter