Nathaniel Guse b4b1704a9b Merge remote-tracking branch 'remotes/Marc/ticket/11587' into develop ...

# By Marc Alexander
# Via Marc Alexander
* remotes/Marc/ticket/11587:
  [ticket/11587] Add functional tests for group teampage settings
  [ticket/11587] Pass legend and teampage settings to group_create()

2013-06-06 14:23:20 -05: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

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

2013-05-20 11:54:39 -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-06-03 15:05:09 +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 'remotes/Marc/ticket/11587' into develop

2013-06-06 14:23:20 -05:00

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 remote-tracking branch 'remotes/cyberalien/feature/editor-code-tabs' into develop

2013-06-06 14:07:27 -05: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

…