Oleg Pudeyev 10ee54d028 [ticket/11015] Restore whitespace to avoid conflict when merging develop. ...

PHPBB3-11015

2012-12-13 07:56:23 -05:00

..

adm

[ticket/11209] Clone disable moving images to allow multiple per page

2012-11-16 11:41:39 +01:00

assets/javascript

Merge PR #890 branch 'nickvergessen/ticket/10982' into develop

2012-10-16 21:47:13 -04:00

cache

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

config

[feature/controller] Update routing documentation for using query string

2012-11-18 13:40:24 -05:00

develop

Merge branch 'develop-olympus' into develop

2012-11-29 23:17:58 +01:00

docs

[ticket/10091] Bump minimum supported postgresql version to 8.3.

2012-12-04 02:52:18 -05:00

download

Merge remote-tracking branch 'upstream/develop' into ticket/11015

2012-12-06 21:49:24 -05:00

files

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

images

…

includes

[ticket/11015] Restore whitespace to avoid conflict when merging develop.

2012-12-13 07:56:23 -05:00

install

Merge remote-tracking branch 'upstream/develop' into ticket/11015

2012-12-06 21:49:24 -05:00

language

[ticket/10091] Bump minimum supported postgresql version to 8.3.

2012-12-04 02:52:18 -05:00

store

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

styles

Merge PR #1053 branch 'develop-olympus' into develop

2012-12-05 12:21:25 -05:00

.htaccess

[feature/controller] Remove url rewriting until we use pathinfo in controllers

2012-11-18 13:32:54 -05:00

app.php

[feature/controller] Check for proper status codes from controllers

2012-11-19 12:37:20 -05:00

common.php

Merge remote-tracking branch 'upstream/develop' into ticket/11015

2012-12-06 21:49:24 -05:00

composer.json

[ticket/11238] Set goutte version to 0.1.0.

2012-12-02 23:44:49 -05:00

composer.lock

[ticket/11238] Set goutte version to 0.1.0.

2012-12-02 23:44:49 -05:00

cron.php

[ticket/11189] Replace DEBUG_EXTRA with DEBUG

2012-11-10 10:45:02 -06:00

faq.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

feed.php

[ticket/11077] Remove code from old global announcements system

2012-11-11 13:04:14 +01:00

index.php

[feature/controller] Implement a front controller

2012-11-16 16:25:09 -05:00

mcp.php

[feature/php-events] Readd comment from d06adb06e9

2012-08-11 11:49:48 +02:00

memberlist.php

[ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968

2012-10-17 23:34:37 +02:00

posting.php

Merge pull request #962 from imkingdavid/feature/add_events

2012-09-01 12:44:23 -07:00

report.php

[ticket/10845] Removed one empty line that wasn't supposed to be there

2012-06-14 19:23:46 +01:00

search.php

[ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968

2012-10-17 23:34:37 +02:00

ucp.php

Merge branch 'develop-olympus' into develop

2012-10-29 15:16:59 -04:00

viewforum.php

[ticket/8796] Mark read links updated to include time() in url

2012-09-03 18:51:29 -05:00

viewonline.php

[ticket/11014] Fix old pagination assignment

2012-10-17 23:34:37 +02:00

viewtopic.php

Merge remote-tracking branch 'Fyorl/feature/attach-dl' into develop

2012-08-26 18:56:09 +02:00

web.config

[feature/controller] Remove URL rewriting by default

2012-11-16 17:06:02 -05:00