friendica 7ab2c715a4 Merge https://github.com/tonybaldwin/friendica-addons into apull ...

resolved several conflicts and mibbit was not removed
Conflicts:
	ljpost/ljpost.css
	ljpost/ljpost.php

2012-03-02 16:44:30 -08:00

2.6 KiB

Raw History

View raw