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
|
|
|
|
|
|
|
|
|
|
|
|
also makes the local navigation's tabs stay in context with the content
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
better.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
theme/base/css/display.css
|
|
|
|
Intention for this layout was to reduce whitespace in header area
|
|
|
|
|
|
|
|
|