Joas Schilling a5c971176b Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/10776] update min php version 5.3.3 in readme
  [ticket/10776] Fixed a couple language changes in docs/README.html.
  [ticket/10776] Fixed errors in docs/README.html.

Conflicts:
	phpBB/docs/README.html

2013-06-21 17:12:58 +02:00

..

adm

Merge remote-tracking branch 'remotes/cyberalien/feature/editor-code-tabs' into develop

2013-06-06 14:07:27 -05:00

assets/javascript

Merge remote-tracking branch 'remotes/cyberalien/feature/editor-code-tabs' into develop

2013-06-06 14:07:27 -05:00

cache

…

config

[ticket/11481] Remove globals and use dependency injection instead

2013-06-06 20:32:47 +02:00

develop

[ticket/11413] Undo editing the user_notifications table

2013-04-29 21:22:07 -05:00

docs

Merge branch 'develop-olympus' into develop

2013-06-21 17:12:58 +02:00

download

[ticket/10820] fix if condition to check for IE

2013-06-14 00:29:06 +05:30

files

…

images

…

includes

[ticket/11503] similar implementation for mssql_native and odbc

2013-06-20 19:16:21 +05:30

install

Merge branch 'develop-olympus' into develop

2013-06-06 12:56:36 -05:00

language

Merge branch 'develop-olympus' into develop

2013-06-05 01:55:49 +05:30

store

…

styles

Merge branch 'develop-olympus' into develop

2013-06-20 01:21:34 +02:00

.htaccess

…

app.php

…

common.php

[ticket/11335] Replace "$phpEx" with $phpEx

2013-04-24 20:39:24 -05:00

composer.json

Merge branch 'develop-olympus' into develop

2013-05-09 19:42:13 +02:00

composer.lock

Merge branch 'develop-olympus' into develop

2013-05-09 19:42:13 +02:00

cron.php

…

faq.php

…

feed.php

[ticket/11481] Move prepended slash from calls into function

2013-06-06 20:35:38 +02:00

index.php

…

mcp.php

[ticket/9975] Moved a few E_USER_ERROR errors to /language

2013-04-23 09:55:36 -07:00

memberlist.php

[ticket/11454] Use set_addresses in other applicable areas

2013-04-24 15:34:12 -05:00

posting.php

Merge branch 'develop-olympus' into develop

2013-05-06 22:11:33 +02:00

report.php

…

search.php

…

ucp.php

…

viewforum.php

…

viewonline.php

…

viewtopic.php

…

web.config

…