Joas Schilling 367bc23009 Merge branch 'develop-olympus' into develop ...

Conflicts:
	phpBB/includes/functions.php

2011-10-13 14:46:16 +02:00

..

adm

Merge branch 'develop-olympus' into develop

2011-09-27 20:58:17 +02:00

assets/javascript

[ticket/10155] Update to jQuery 1.6.2

2011-07-12 10:24:20 +02:00

cache

…

develop

[feature/remove-db-styles] Update database schemas.

2011-09-20 21:06:52 +01:00

docs

Merge remote-tracking branch 'igorw/ticket/10155' into develop

2011-09-05 06:03:19 -04:00

download

[ticket/10359] Fix phpbb_request regression in download/file.php

2011-09-08 22:37:19 +02:00

files

…

images

…

includes

Merge branch 'develop-olympus' into develop

2011-10-13 14:46:16 +02:00

install

[ticket/10152] Remove end '?>' from generated config.php.

2011-09-21 08:36:53 +01:00

language

[feature/remove-db-styles] Update language to reflect removal of db storage.

2011-09-20 22:42:52 +01:00

store

…

styles

Merge branch 'develop' of github.com:phpbb/phpbb3 into develop

2011-09-21 18:12:07 +02:00

.htaccess

…

common.php

Merge remote-tracking branch 'github-p/feature/template-engine' into develop

2011-08-13 23:59:15 -04:00

cron.php

[ticket/10046] Remove register_shutdown_function() in cron.php from develop.

2011-03-12 15:07:31 +01:00

faq.php

…

feed.php

[feature/remove-imagesets] Adjustments to php files

2011-09-04 01:08:00 +03:00

index.php

Merge branch 'develop-olympus' into develop

2011-08-30 01:41:41 +02:00

mcp.php

[ticket/9684] Remove code for global announcement in root-files

2011-04-07 13:45:44 +02:00

memberlist.php

Merge branch 'develop-olympus' into develop

2011-08-18 17:46:31 -04:00

posting.php

[ticket/9608] Remove use of references in captcha and other places

2011-07-13 11:32:38 +02:00

report.php

Merge branch 'develop-olympus' into develop

2011-07-16 22:28:55 -04:00

search.php

[feature/remove-imagesets] Adjustments to php files

2011-09-04 01:08:00 +03:00

ucp.php

Merge branch 'develop-olympus' into develop

2011-05-13 01:29:57 +02:00

viewforum.php

[feature/remove-imagesets] Adjustments to php files

2011-09-04 01:08:00 +03:00

viewonline.php

[ticket/10290] Fixed malformed SQL query in viewonline.php

2011-08-04 23:16:23 -04:00

viewtopic.php

[feature/remove-imagesets] Adjustments to php files

2011-09-04 01:08:00 +03:00

web.config

[ticket/10219] Remove invalid and invisible character from web.config.

2011-06-14 23:18:33 +02:00