]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1508-vier-popup-menu
authorMichael Vogel <icarus@dabo.de>
Sun, 30 Aug 2015 08:44:29 +0000 (10:44 +0200)
committerMichael Vogel <icarus@dabo.de>
Sun, 30 Aug 2015 08:44:29 +0000 (10:44 +0200)
commitcc3419f1016d2adc41996c077143bf872ace2383
treead93a3e203e81d1aeec83fe3919b60f00250287a
parent31fffcf281a3fc2e2f30cfd1d632c7409c0e1dd5
parent3d614a0fcdf5f579ad951664a4f2fbb2f9b4ec6c
Merge remote-tracking branch 'upstream/develop' into 1508-vier-popup-menu

Conflicts:
mod/dfrn_notify.php