Fixed conflict while merging v4 into v5

2026-05-20 05:29:18 +00:00 · 2015-02-10 16:37:18 +05:30
parent 2813f38c5a eac82039e3
commit 15cd12214e
55 changed files with 7612 additions and 3974 deletions
--- a/test_sites/test_site/site_config.json
+++ b/test_sites/test_site/site_config.json
@@ -4,5 +4,6 @@
 "admin_password": "admin",
 "auto_email_id": "admin@example.com",
 "host_name": "http://localhost:8888",
+ "auto_email_id": "admin@example.com",
 "mute_emails": 1
 }