8b551ee318
Conflicts: app/controllers/projects/services_controller.rb app/models/project_services/emails_on_push_service.rb |
||
---|---|---|
.. | ||
_form.html.haml | ||
edit.html.haml | ||
index.html.haml |
8b551ee318
Conflicts: app/controllers/projects/services_controller.rb app/models/project_services/emails_on_push_service.rb |
||
---|---|---|
.. | ||
_form.html.haml | ||
edit.html.haml | ||
index.html.haml |