darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-25 16:54:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into error-handling

Browse Source 
Conflicts:
	app/main/views/invites.py
This commit is contained in:
Rebecca Law
2016-03-10 15:03:21 +00:00
parent 735ca07dee 8c250a7853
commit 4ba801edab
16 changed files with 219 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/main/dao/templates_dao.py
View File

@@ -1,7 +1,6 @@
from flask import url_for, abort
from flask import url_for
from app import notifications_api_client
from app.utils import BrowsableItem
from notifications_python_client.errors import HTTPError
def insert_service_template(name, type_, content, service_id, subject=None):