Skip to content
Snippets Groups Projects
Commit d61319d5 authored by Shane Tomlinson's avatar Shane Tomlinson
Browse files

Merge remote-tracking branch 'origin/dev' into issue_1240_tos_update 

* Remove the sitesTOSPP logic from the add_email controller, it should not have been added there.

Conflicts:
	resources/static/dialog/controllers/add_email.js
parents c23c4083 f8b50537
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 364 additions and 151 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment