Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

11 years ago · 78854685d4
parent 337885503e 6198c3565b
commit 78854685d4
1 changed files with 3 additions and 3 deletions
--- a/config/settings.yml
+++ b/config/settings.yml
@ -239,8 +239,8 @@ tags_show_search_results:
 forge_domain:
  default: forge.trustie.net
 project_domain:
-  default: project.trustie.net
+  default: forge.trustie.net
 contest_domain:
-  default: contest.trustie.net
+  default: forge.trustie.net
 course_domain:
-  default: course.trustie.net
+  default: forge.trustie.net