resolved several conflicts and mibbit was not removed
Conflicts:
	ljpost/ljpost.css
	ljpost/ljpost.php
This commit is contained in:
friendica 2012-03-02 16:44:30 -08:00
commit 7ab2c715a4
9 changed files with 308 additions and 1 deletions

Binary file not shown.