diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-07-13 13:16:58 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-07-13 13:16:58 -0400 |
| commit | 0ef95a7009f48960a317f406f4d9e95c58b34d6f (patch) | |
| tree | 8b7864a2e10a8a046fc591865df3254f2ffa3798 /phpBB/adm/images | |
| parent | 1783134217830223edfe9bde616e424c4974b6af (diff) | |
| parent | 034155531446acd13b497cd25fa7528ce7cdf9c6 (diff) | |
| download | forums-0ef95a7009f48960a317f406f4d9e95c58b34d6f.tar forums-0ef95a7009f48960a317f406f4d9e95c58b34d6f.tar.gz forums-0ef95a7009f48960a317f406f4d9e95c58b34d6f.tar.bz2 forums-0ef95a7009f48960a317f406f4d9e95c58b34d6f.tar.xz forums-0ef95a7009f48960a317f406f4d9e95c58b34d6f.zip | |
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
Diffstat (limited to 'phpBB/adm/images')
0 files changed, 0 insertions, 0 deletions