31c1177970
Conflicts: EVENTS.txt actions/peopletag.php actions/tagother.php classes/Notice.php js/util.js js/util.min.js lib/accountprofileblock.php lib/action.php lib/activityobject.php lib/command.php lib/personalgroupnav.php plugins/OStatus/OStatusPlugin.php |
||
---|---|---|
.. | ||
css | ||
images | ||
default-avatar-mini.png | ||
default-avatar-profile.png | ||
default-avatar-stream.png | ||
logo.png |