Andreas Fischer d3a1b670bd Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/7138] Allow simple header and footer for trigger_error() messages

Conflicts:
	phpBB/styles/prosilver/template/message_body.html

2011-11-13 20:28:29 +01:00

..

adm

Merge remote-tracking branch 'nickvergessen/ticket/10410' into develop

2011-11-01 20:04:08 +01:00

assets/javascript

…

cache

…

develop

Merge branch 'develop-olympus' into develop

2011-10-16 20:16:25 +02:00

docs

Merge branch 'develop-olympus' into develop

2011-10-29 12:22:17 +02: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-11-13 16:09:12 +01:00

install

Merge remote-tracking branch 'nickvergessen/ticket/10410' into develop

2011-11-01 20:04:08 +01:00

language

Merge remote-tracking branch 'nickvergessen/ticket/10410' into develop

2011-11-01 20:04:08 +01:00

store

…

styles

Merge branch 'develop-olympus' into develop

2011-11-13 20:28:29 +01:00

.htaccess

…

common.php

[ticket/10412] Replace memory_get_usage with memory_get_peak_usage

2011-10-14 02:02:17 +02:00

cron.php

…

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

…

memberlist.php

[ticket/10410] Add option to display users in their first teampage group

2011-10-28 22:55:26 +02:00

posting.php

…

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

…

viewforum.php

Merge branch 'develop-olympus' into develop

2011-11-13 15:35:27 +01:00

viewonline.php

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

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

viewtopic.php

Merge branch 'develop-olympus' into develop

2011-11-11 22:17:12 +01:00

web.config

…