friendica/friendica-addons
1
0
Fork 0
mirror of https://git.friendi.ca/friendica/friendica-addons.git synced 2025-07-12 03:18:48 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

16
ljpost/ljpost.css
View file

@ -1,5 +1,6 @@
#ljpost-enable-label, #ljpost-username-label, #ljpost-password-label, #ljpost-bydefault-label {
<<<<<<< HEAD
float: left;
width: 200px;
margin-top: 10px;
@ -14,3 +15,18 @@
margin-top: 15px;
}
=======
float: left;
width: 200px;
margin-top: 10px;
}
#ljpost-checkbox, #ljpost-username, #ljpost-password, #ljpost-bydefault {
float: left;
margin-top: 10px;
}
#ljpost-submit {
margin-top: 15px;
}
>>>>>>> 99d9fddb6af9e872266666038447771e42ce13b4