]> git.mxchange.org Git - friendica-addons.git/commit
projects / friendica-addons.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e81e7f7 99d9fdd)
Merge https://github.com/tonybaldwin/friendica-addons into apull
authorfriendica <info@friendica.com>
Sat, 3 Mar 2012 00:44:30 +0000 (16:44 -0800)
committerfriendica <info@friendica.com>
Sat, 3 Mar 2012 00:44:30 +0000 (16:44 -0800)
commit7ab2c715a4001e9aebbc1db70b5fcac7e61f463f
tree2048a77219224ac215cb3abd4a0f8806b12953cdtree | snapshot
parente81e7f7e79710233c0aeac9f8039bf6548cf8013commit | diff
parent99d9fddb6af9e872266666038447771e42ce13b4commit | diff
Merge https://github.com/tonybaldwin/friendica-addons into apull
resolved several conflicts and mibbit was not removed
Conflicts:
ljpost/ljpost.css
ljpost/ljpost.php
communityhome.tgz diff1 | diff2 | blob | history
ljpost.tgz diff1 | | blob | history
ljpost/ljpost.css diff1 | diff2 | blob | history
ljpost/ljpost.php diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.