]> git.mxchange.org Git - friendica-addons.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Tue, 20 Mar 2012 07:20:10 +0000 (03:20 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Tue, 20 Mar 2012 07:20:10 +0000 (03:20 -0400)
commita649c1966d8b2ab053dad7549f1213939bf066ad
tree68ff18621c554aff0ba584dac1ba06b5c355a40b
parenta21d2b4a78bc138164e1b36aa67565046b2be153
parentb8dd62d229a152a5203bf6a14bab847425a33947
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: