Skip to content
Snippets Groups Projects
Commit 6ef808bd authored by quark's avatar quark
Browse files

Merge branch 'master' into 'ago' 

# Conflicts:
#   templates/scripts/intro_mail.html
#   templates/scripts/intro_mail.txt
parents 41409662 d1ebf893
No related branches found
No related tags found
1 merge request!8email templates for AGO
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 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