Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
Conflicts:
lib/attachmentlist.php
plugins/OStatus/classes/Ostatus_profile.php
Merge tried to delete things that it seems it shouldn't, very confusing order. Hope rest of the cherry-picking isn't a problem.
|
|
|
|
moderator icons
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
visible on @title of the enable/disable button.
|
|
|
|
|
|
|
|
|
|
attachment. Init UI. Probably a little buggy.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
treatment) in default and identica themes
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
icons.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|