]> git.mxchange.org Git - friendica.git/commit - view/theme/loozah/photo-menu.jpg
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b5bcf44 890753e)
Merge branch 'iconpopup' of https://github.com/fabrixxm/friendika into fabrixxm-iconpopup
authorFriendika <info@friendika.com>
Mon, 4 Apr 2011 08:22:05 +0000 (01:22 -0700)
committerFriendika <info@friendika.com>
Mon, 4 Apr 2011 08:22:05 +0000 (01:22 -0700)
commit379af2521559c263622348bce41872b61067e532
tree1e082da12910b6e7ee187c64a2f8ade50479516btree | snapshot
parentb5bcf44354410e2c37d5ec143c7050c3903200edcommit | diff
parent890753e5b545ca5777c6c9084e99cacf42a3b485commit | diff
Merge branch 'iconpopup' of https://github.com/fabrixxm/friendika into fabrixxm-iconpopup

Conflicts:
mod/dfrn_poll.php
mod/dfrn_poll.php diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.