]> git.mxchange.org Git - friendica.git/commit - view/theme/quattro/templates/nav.tpl
Merge remote-tracking branch 'upstream/develop' into 1606-dbm
authorMichael Vogel <icarus@dabo.de>
Wed, 1 Jun 2016 08:55:13 +0000 (10:55 +0200)
committerMichael Vogel <icarus@dabo.de>
Wed, 1 Jun 2016 08:55:13 +0000 (10:55 +0200)
commit395e83fa06476a57ca5ace941120a274a8472f00
tree3684dac4dfafac889aee4868ae15dc94e8289025
parentf07c96ee5f932a83b571ae8caaa821877d4b75e3
parent4e1c51500404de5a6b33c95cfeafe3710b752c7f
Merge remote-tracking branch 'upstream/develop' into 1606-dbm