5d09b6b3f0
Conflicts: EVENTS.txt actions/finishremotesubscribe.php actions/postnotice.php actions/public.php actions/remotesubscribe.php actions/showstream.php actions/updateprofile.php actions/userauthorization.php classes/laconica.ini lib/common.php lib/oauthstore.php lib/omb.php |
||
---|---|---|
.. | ||
farbtastic | ||
jcrop | ||
facebookapp.js | ||
identica-badge.js | ||
install.js | ||
jquery.form.js | ||
jquery.joverlay.js | ||
jquery.joverlay.min.js | ||
jquery.js | ||
jquery.min.js | ||
userdesign.go.js | ||
util.js | ||
xbImportNode.js |