brunoais ac8a4b05b4 [ticket/13146] Fixing what merging broke ...

Merging added content I didn't expect it to add. This fixes back to what it is supposed to be.

PHPBB3-13146

2014-12-03 13:55:53 +00:00

..

adm

Merge pull request #3150 from omniError/ticket/13347

2014-11-21 20:09:13 +01:00

assets

[ticket/13277] Force IE to not cache AJAX requests.

2014-11-18 00:41:57 -08:00

bin

…

cache

…

config

[ticket/13146] Adding eventDispatcher to the list

2014-12-03 13:55:53 +00:00

develop

…

docs

[prep-release-3.1.2] Update Changelog with 13376

2014-11-25 15:44:39 +01:00

download

…

ext

…

files

…

images

…

includes

[prep-release-3.1.2] Update the development version to 3.1.3-RC1-dev

2014-11-25 16:43:43 +01:00

install

[prep-release-3.1.2] Update the development version to 3.1.3-RC1-dev

2014-11-25 16:43:43 +01:00

language

[ticket/10744] Prevent installing styles with reserved names

2014-11-21 23:55:48 +01:00

phpbb

[ticket/13146] Fixing what merging broke

2014-12-03 13:55:53 +00:00

store

…

styles

[ticket/13391] subsilver2 poll options must have a setting of 1 when editing a post

2014-11-26 14:09:07 -05:00

.htaccess

…

app.php

…

common.php

[ticket/13070] Adjust template hook name to match that provided in the class.

2014-10-20 19:59:56 -07:00

composer.json

…

composer.lock

Merge branch 'develop-olympus' into develop-ascraeus

2014-11-11 15:29:58 +01:00

cron.php

…

faq.php

…

feed.php

…

index.php

[ticket/12885] New if for Index-page - board-index-text switch

2014-11-22 00:09:38 +01:00

mcp.php

…

memberlist.php

[ticket/13265] Don't show link to edit own profile to those without permission

2014-11-05 21:06:32 +01:00

posting.php

Merge pull request #3127 from omniError/ticket/13323

2014-11-21 23:33:45 +01:00

report.php

…

search.php

[ticket/13253] Fix MCP queue link in active topics search.

2014-10-30 22:47:51 -07:00

ucp.php

…

viewforum.php

[ticket/13241] Fix pagination with global announcements

2014-10-29 13:42:42 +01:00

viewonline.php

…

viewtopic.php

[ticket/13326] fix CS

2014-11-11 10:51:03 -06:00

web.config

…