]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1502-altpager-default
authorMichael Vogel <icarus@dabo.de>
Sun, 8 Feb 2015 12:26:28 +0000 (13:26 +0100)
committerMichael Vogel <icarus@dabo.de>
Sun, 8 Feb 2015 12:26:28 +0000 (13:26 +0100)
commit8871591a98fe0c6b2bde8845c7906f2e14122bea
tree8c2cea811d7f1ce15972f13bdaa4d27b718dab44
parent1d48ab0191fbf0dba4d62fdbb35301b1e988c37d
parentb4dc344f9c0f50f02ea4d327141d1c4f570b283c
Merge remote-tracking branch 'upstream/develop' into 1502-altpager-default

Conflicts:
mod/admin.php
mod/admin.php
view/templates/admin_site.tpl