Merge branch 'release/2015-03-26'

mozilla · Mar 26, 2015 · dfcd1e1 · dfcd1e1
2 parents c4e690d + d301793
commit dfcd1e1
Show file tree

Hide file tree

Showing 451 changed files with 184 additions and 467 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
-settings/local*.py
-settings/ldap_settings.py
-settings/mounts_local.py
+/elmo/settings/local*.py
+/elmo/settings/ldap_settings.py
+/elmo/settings/mounts_local.py
 /env/
 @elmo
 *.pyc

diff --git a/apps/commons/context_processors.py b/apps/commons/context_processors.py
diff --git a/apps/commons/helpers.py b/apps/commons/helpers.py
diff --git a/apps/commons/middleware.py b/apps/commons/middleware.py
diff --git a/apps/commons/urlresolvers.py b/apps/commons/urlresolvers.py
diff --git a/apps/homepage/templates/homepage/locale-team.html b/apps/homepage/templates/homepage/locale-team.html
@@ -71,7 +71,7 @@ <h2>Web Dashboard <a href="#webdashboard" class="permalink">#</a></h2>
 
 <p class="intro">The team's work on the <a href="http://www.mozilla.org/{{ locale.code }}/">mozilla.org website</a>
 is tracked on the <a href="{{ webdashboard_url }}?locale={{ locale.code }}">Web Dashboard</a>.
-<a href="http://viewvc.svn.mozilla.org/vc/projects/mozilla.com/trunk/{{ locale.code }}/">The sources</a> are in SVN,
+<a href="http://viewvc.svn.mozilla.org/vc/projects/mozilla.com/trunk/locales/{{ locale.code }}/">The sources</a> are in SVN,
 you can check the current status on the <a href="https://www-dev.allizom.org/{{ locale.code }}/firefox/whatsnew">team's staging site</a>.</p>
 
   <div class="loading">