diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-08-18 17:46:31 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-08-18 17:46:31 -0400 |
| commit | d06dcd69e60bc3e6eafb4a11dfb1639fa4e4646b (patch) | |
| tree | fc60cf66ef1544b6fc72ac1b5f57d0bf4ae1d923 /phpBB/includes/mcp | |
| parent | 9589fbffe4cdad9fa35df2597c21fc0753ed1d52 (diff) | |
| parent | 6330153937b9321ce71226a7692403b64ad8e0c7 (diff) | |
| download | forums-d06dcd69e60bc3e6eafb4a11dfb1639fa4e4646b.tar forums-d06dcd69e60bc3e6eafb4a11dfb1639fa4e4646b.tar.gz forums-d06dcd69e60bc3e6eafb4a11dfb1639fa4e4646b.tar.bz2 forums-d06dcd69e60bc3e6eafb4a11dfb1639fa4e4646b.tar.xz forums-d06dcd69e60bc3e6eafb4a11dfb1639fa4e4646b.zip | |
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
Diffstat (limited to 'phpBB/includes/mcp')
0 files changed, 0 insertions, 0 deletions