Dmitriy Zaporozhets 8b551ee318 Merge branch 'emails-on-push' ...

Conflicts:
	app/controllers/projects/services_controller.rb
	app/models/project_services/emails_on_push_service.rb

2015-03-08 16:49:11 -07:00

..

_form.html.haml

Merge branch 'emails-on-push'

2015-03-08 16:49:11 -07:00

edit.html.haml

Add admin services templates.

2015-02-11 17:55:33 -08:00

index.html.haml

fix typo

2015-02-27 22:49:40 +01:00