diff options
author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-06-24 13:49:29 -0500 |
---|---|---|
committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-06-24 13:49:29 -0500 |
commit | ff84aed0b2e5bb2def73a1861e601ad9fb8856df (patch) | |
tree | 22ffb4b331619cfb96002b526c6b45b3fc297332 /phpBB/includes/template/phpbb.php | |
parent | 2dd58413e26434568bd768549e621e72b5ccb33c (diff) | |
parent | a5c971176be81f854772919713da6db506fa7cd1 (diff) | |
download | forums-ff84aed0b2e5bb2def73a1861e601ad9fb8856df.tar forums-ff84aed0b2e5bb2def73a1861e601ad9fb8856df.tar.gz forums-ff84aed0b2e5bb2def73a1861e601ad9fb8856df.tar.bz2 forums-ff84aed0b2e5bb2def73a1861e601ad9fb8856df.tar.xz forums-ff84aed0b2e5bb2def73a1861e601ad9fb8856df.zip |
Merge branch 'develop' of github.com:phpbb/phpbb3 into feature/twig
# By Dhruv (35) and others
# Via Andreas Fischer (15) and others
* 'develop' of github.com:phpbb/phpbb3: (75 commits)
[ticket/10776] update min php version 5.3.3 in readme
[ticket/11503] similar implementation for mssql_native and odbc
[ticket/11603] Fix out dated comment
[ticket/11603] Fix usage note
[ticket/11604] Skip installer step where config.php is created.
[ticket/11603] Throw RuntimeExceptions instead of using exit()
[ticket/11603] Avoid using cURL
[ticket/11604] Fix case where config.php is not generated by phpBB.
[ticket/11604] Use variables for config.php filesnames.
[ticket/11561] Specify used tables in notification fixture, so they are emptied
[ticket/11094] Add textbox for jabber while memberlist search
[ticket/10820] fix if condition to check for IE
[ticket/11603] Split api_request into two functions (query only vs. full url)
[ticket/11603] Fix spacing and add some comments
[ticket/10820] Add additional check for IE in condition
[ticket/11603] Fix github API calls
[ticket/11603] Rename network to forks and fix handling
[ticket/11603] Fix github api url and use curl with valid user agent
[ticket/10820] Fix function docblock
[ticket/10820] Inject IE version in function
...
Diffstat (limited to 'phpBB/includes/template/phpbb.php')
0 files changed, 0 insertions, 0 deletions