phpbb/phpBB
Andreas Fischer a01e916737 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9916] Changing header in non-distributed files
  [ticket/9916] Changing coding guidelines license
  [ticket/9916] Updating License in the header

Conflicts:
	tests/mock/cache.php
2012-01-02 17:36:21 +01:00
..
adm Merge branch 'develop-olympus' into develop 2011-12-16 15:50:11 +01:00
assets/javascript [ticket/10155] Update to jQuery 1.6.2 2011-07-12 10:24:20 +02:00
cache [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
develop Merge branch 'develop-olympus' into develop 2012-01-02 17:36:21 +01:00
docs Merge branch 'develop-olympus' into develop 2012-01-02 17:36:21 +01:00
download [feature/extension-manager] The class loader no longer knows about extensions 2011-09-29 15:42:46 +02:00
files [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
images [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
includes [ticket/10557] Added IN_PHPBB check to functions_acp.php 2011-12-28 18:52:33 +00:00
install Merge branch 'develop-olympus' into develop 2012-01-01 16:09:53 +01:00
language Merge branch 'develop-olympus' into develop 2011-12-08 22:22:29 +01:00
store [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
styles Merge branch 'develop-olympus' into develop 2011-12-25 00:58:11 +01:00
.htaccess [Feature] Ability to use HTTP authentication in ATOM feeds by passing the GET parameter auth=http 2010-01-19 19:08:51 +00:00
common.php Merge branch 'develop' into feature/extension-manager 2011-11-18 19:14:06 +01:00
cron.php [feature/extension-manager] Refactoring the structure of extension provider 2011-09-29 16:15:53 +02:00
faq.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
feed.php [ticket/10345] Use the plural function in some more places. 2011-11-25 15:10:49 -05:00
index.php [ticket/10345] Use the plural function in some more places. 2011-11-25 15:10:49 -05:00
mcp.php [ticket/9684] Remove code for global announcement in root-files 2011-04-07 13:45:44 +02:00
memberlist.php [ticket/10345] Use the plural function in some more places. 2011-11-25 15:10:49 -05:00
posting.php Merge branch 'develop-olympus' into develop 2011-12-04 00:06:14 +01:00
report.php Merge branch 'develop-olympus' into develop 2011-07-16 22:28:55 -04:00
search.php [ticket/10345] Use the plural function in some more places. 2011-11-25 15:10:49 -05:00
ucp.php [ticket/10484] Use variables for sql_build_query() calls 2011-11-21 16:22:07 +01:00
viewforum.php Merge branch 'develop-olympus' into develop 2011-12-09 01:32:29 +01:00
viewonline.php [ticket/10345] Make use of the plural function in some basic places 2011-11-25 15:10:44 -05:00
viewtopic.php Merge branch 'develop-olympus' into develop 2011-12-09 01:32:29 +01:00
web.config [ticket/10219] Remove invalid and invisible character from web.config. 2011-06-14 23:18:33 +02:00