Nils Adermann d06dcd69e6 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/8571] Show age as 0 in birthday list when birthday is in the future.
  [ticket/8571] Show 'Age: 0' on viewprofile when birthday is in the future.
  [ticket/8571] Also display age on memberlist/viewprofile when age is 0.

Conflicts:
	phpBB/index.php

2011-08-18 17:46:31 -04:00

..

adm

Merge branch 'develop-olympus' into develop

2011-07-30 19:37:24 -04:00

cache

…

develop

Merge remote-tracking branch 'github-p/feature/template-engine' into develop

2011-08-13 23:59:15 -04:00

docs

Merge remote-tracking branch 'github-p/feature/template-engine' into develop

2011-08-13 23:59:15 -04:00

download

Merge branch 'develop-olympus' into develop

2011-06-15 18:51:45 +02:00

files

…

images

…

includes

Merge remote-tracking branch 'igorw/ticket/9608' into develop

2011-08-14 19:24:27 -04:00

install

Merge remote-tracking branch 'github-p/feature/template-engine' into develop

2011-08-13 23:59:15 -04:00

language

Merge branch 'develop-olympus' into develop

2011-07-30 19:37:24 -04:00

store

…

styles

Merge branch 'develop-olympus' into develop

2011-08-18 17:46:31 -04:00

.htaccess

…

common.php

Merge remote-tracking branch 'github-p/feature/template-engine' into develop

2011-08-13 23:59:15 -04:00

cron.php

…

faq.php

…

feed.php

…

index.php

Merge branch 'develop-olympus' into develop

2011-08-18 17:46:31 -04:00

mcp.php

…

memberlist.php

Merge branch 'develop-olympus' into develop

2011-08-18 17:46:31 -04:00

posting.php

[ticket/9608] Remove use of references in captcha and other places

2011-07-13 11:32:38 +02:00

report.php

Merge branch 'develop-olympus' into develop

2011-07-16 22:28:55 -04:00

search.php

…

style.php

Merge branch 'develop-olympus' into develop

2011-06-15 18:51:45 +02:00

ucp.php

…

viewforum.php

Merge branch 'develop-olympus' into develop

2011-07-16 21:57:16 -04:00

viewonline.php

[ticket/10290] Fixed malformed SQL query in viewonline.php

2011-08-04 23:16:23 -04:00

viewtopic.php

Merge branch 'develop-olympus' into develop

2011-08-16 18:09:42 +02:00

web.config

[ticket/10219] Remove invalid and invisible character from web.config.

2011-06-14 23:18:33 +02:00