From: Simon L'nu <simon.lnu@gmail.com>
Date: Tue, 20 Mar 2012 07:20:10 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a649c1966d8b2ab053dad7549f1213939bf066ad;p=friendica-addons.git

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  cleanup shaka emoticon
  Beard, Shaka, headbang, and whitebeard that somehow didn't get commited
  fix missing packages
  package updates
  This deactivated the plugin not only when uninstalling it, but also when updating it
  Music smileys
  misc new smileys
  Laughing smileys
  Banana smiley - may need to be removed if I can't verify licence
  respect smileys
  add frown plugin
  Delete the app_access_token once the addon is uninstalled. And some more error handling

* master:
---

a649c1966d8b2ab053dad7549f1213939bf066ad