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

* develop-olympus:
  [ticket/11537] Adjust error message on ucp group manage to fit rest of ucp

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

2013-05-19 15:44:25 +02:00

..

adm

[ticket/11442] Do not suggest an option on ajax confirm box

2013-05-08 00:07:13 +02:00

assets/javascript

Merge remote-tracking branch 'remotes/cyberalien/ticket/10741' into develop

2013-05-11 20:15:53 -05:00

cache

…

config

[ticket/11415] Remove migrator dependency from extension manager

2013-05-01 14:09:08 -05:00

develop

…

docs

Merge branch 'develop-olympus' into develop

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

download

[ticket/11144] Add missing {FORUM_NAME} variable

2013-05-06 21:31:16 +02:00

files

…

images

…

includes

Merge remote-tracking branch 'EXreaction/ticket/11415' into develop

2013-05-18 11:20:47 -04:00

install

Merge branch 'develop-olympus' into develop

2013-05-16 19:12:04 +02:00

language

Merge PR #1209 branch 'dhruvgoel92/ticket/10325' into develop

2013-05-08 08:23:11 -04:00

store

…

styles

Merge branch 'develop-olympus' into develop

2013-05-19 15:44:25 +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

…

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

…