Nathaniel Guse 67c85fa4d3 Merge branch 'develop-olympus' into develop ...

# By Senky
# Via Nathaniel Guse (1) and Senky (1)
* develop-olympus:
  [ticket/10050] removing prosilver edits
  [ticket/10050] adding .topicrow to template condition

Conflicts:
	phpBB/styles/subsilver2/template/viewforum_body.html

2013-01-30 16:56:16 -06:00

..

adm

[ticket/11201] Remove MSN/WLM fields

2013-01-11 14:32:44 +01:00

assets/javascript

[ticket/11313] Use correct object el instead of eel in alt_text callback

2013-01-08 23:35:39 +01:00

cache

…

config

…

develop

Merge remote-tracking branch 'remotes/nickv/ticket/11201' into develop

2013-01-15 18:54:11 -06:00

docs

…

download

…

files

…

images

…

includes

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

2013-01-27 17:46:11 -05:00

install

Merge remote-tracking branch 'remotes/nickv/ticket/11201' into develop

2013-01-15 18:54:11 -06:00

language

[ticket/11328] Add language variables for buttons

2013-01-16 11:37:13 +02:00

store

…

styles

Merge branch 'develop-olympus' into develop

2013-01-30 16:56:16 -06:00

.htaccess

…

app.php

…

common.php

…

composer.json

…

composer.lock

…

cron.php

…

faq.php

…

feed.php

…

index.php

…

mcp.php

…

memberlist.php

[ticket/10786] Javascript toggle member search panel in memberlist.php

2013-01-15 23:29:01 -06:00

posting.php

…

report.php

…

search.php

…

ucp.php

…

viewforum.php

…

viewonline.php

…

viewtopic.php

[ticket/11201] Remove MSN/WLM fields

2013-01-11 14:32:44 +01:00

web.config

…