Nils Adermann 0ef95a7009
Merge branch 'develop-olympus' into develop ...
* develop-olympus:
[ticket/11112] Do not change opensource.org link to https
[ticket/11112] Use https for user-visible links to phpbb.com
Conflicts:
phpBB/language/en/install.php
phpBB/language/en/ucp.php
2013-07-13 13:16:58 -04:00
2013-07-12 14:59:43 -05:00
2013-06-06 14:07:27 -05:00
2013-07-13 09:36:24 -04:00
2013-07-11 11:41:48 +02:00
2013-07-13 13:16:58 -04:00
2013-06-14 00:29:06 +05:30
2013-07-13 13:16:58 -04:00
2013-07-13 09:36:24 -04:00
2013-07-13 13:16:58 -04:00
2013-07-13 09:36:24 -04:00
2013-07-13 10:28:02 -05:00
2013-07-13 10:28:02 -05:00
2013-06-06 20:35:38 +02:00
2013-07-11 14:24:07 +02:00
2013-07-11 11:41:48 +02:00
2013-07-11 14:24:07 +02:00
2013-07-01 23:25:29 +05:30
2013-07-11 14:24:07 +02:00
2013-07-12 07:24:35 -04:00
2013-07-13 09:36:24 -04:00
0ef95a7009