зеркало из https://github.com/mozilla/bedrock.git
Merge branch 'bug-614428-add-research-site-b-proxy'
Conflicts: etc/httpd/global.conf
This commit is contained in:
Коммит
121191e920
|
@ -160,5 +160,8 @@ RewriteRule ^/(\w{2,3}(?:-\w{2}(?:-mac)?)?/)?m/privacy.html$ /b/$1m/privacy.html
|
|||
# bug 823302
|
||||
RewriteRule ^/(\w{2,3}(?:-\w{2}(?:-mac)?)?/)?firefox/new-b(.*)$ /b/$1firefox/new-b$2 [PT]
|
||||
|
||||
# bug 683375
|
||||
RewriteRule ^/(\w{2,3}(?:-\w{2}(?:-mac)?)?/)?research(.*)$ /b/$1research$2 [PT]
|
||||
|
||||
# bug 822817
|
||||
RewriteRule ^/telemetry/?$ /b/telemetry/ [PT]
|
||||
|
|
Загрузка…
Ссылка в новой задаче