c11064a539
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. |
||
---|---|---|
.. | ||
farbtastic | ||
jcrop | ||
geometa.js | ||
identica-badge.js | ||
install.js | ||
jquery.cookie.js | ||
jquery.form.js | ||
jquery.joverlay.js | ||
jquery.joverlay.min.js | ||
jquery.js | ||
jquery.min.js | ||
json2.js | ||
userdesign.go.js | ||
util.js | ||
xbImportNode.js |