Nathaniel Guse fd10d97cb1 Merge branch 'develop-olympus' into develop ...

# By Igor Wiedler (1) and others
* develop-olympus:
  [ticket/11671] Update composer.lock
  [ticket/11671] Add phing as a dependency and upgrade deps
  [ticket/11668] Move lint test to the end for travis

Conflicts:
	phpBB/composer.lock

2013-07-13 10:28:02 -05:00

..

adm

Merge remote-tracking branch 'remotes/Hardolaf/ticket/11626' into develop

2013-07-12 14:59:43 -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/11626] Remove LDAP dependency on template

2013-07-12 15:54:41 -04: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-07-12 21:34:15 +02:00

download

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

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

files

…

images

…

includes

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

2013-07-13 11:15:53 -04:00

install

[develop-olympus] Increment version number to 3.0.13-dev.

2013-07-12 21:10:05 +02:00

language

[ticket/11662] Typos: occured -> occurred

2013-07-12 17:51:29 +02:00

store

…

styles

[develop-olympus] Bumping version numbers to final for 3.0.12 releases.

2013-07-12 21:10:05 +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-07-13 10:28:02 -05:00

composer.lock

Merge branch 'develop-olympus' into develop

2013-07-13 10:28:02 -05: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

Merge branch 'ticket/11566' into ticket/11566-develop

2013-07-01 23:25:29 +05:30

search.php

…

ucp.php

…

viewforum.php

…

viewonline.php

…

viewtopic.php

Merge branch 'develop-olympus' into develop

2013-07-11 13:15:26 -05:00

web.config

…