Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7
Browse files Browse the repository at this point in the history
  • Loading branch information
weblate committed Nov 1, 2017
2 parents 0afdf4e + 5aa9727 commit 230fdee
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion doc/conf.py
Expand Up @@ -312,6 +312,7 @@
r'https://software.opensuse.org/package/.*',
# They have messed up SSL setup
r'https://php-myadmin.ru/.*',
# There seems to be some problem with SNI on readthedocs.org
# There seems to be some problem with SNI on Travis CI
r'https://www.phpmyadmin.net/.*',
r'https://files.phpmyadmin.net/.*',
]

0 comments on commit 230fdee

Please sign in to comment.