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

Merge branch 'master' into platform-admin

Browse Source 
Conflicts:
	app/__init__.py
	app/main/views/add_service.py
	app/main/views/jobs.py
	app/templates/main_nav.html
	tests/app/main/views/test_dashboard.py
	tests/conftest.py
This commit is contained in:
Rebecca Law
2016-03-18 16:32:10 +00:00
parent 13d9acf7dd ef1ec2c9a1
commit 402f55be23
66 changed files with 1356 additions and 597 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/main/views/manage_users.py
View File

@@ -3,7 +3,8 @@ from flask import (
render_template,
redirect,
url_for,
flash)
flash
)
from flask_login import (
login_required,