From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 7 Nov 2011 16:41:23 +0000 (+0100)
Subject: Merge branch 'oauthapi'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=00c342e13d833fd215e5dc03a508e1abe660fe21;p=friendica.git

Merge branch 'oauthapi'
---

00c342e13d833fd215e5dc03a508e1abe660fe21
diff --cc images/icons/Makefile
index 6a96fb6762,a39db119a5..ec57b943e9
--- a/images/icons/Makefile
+++ b/images/icons/Makefile
@@@ -2,7 -2,7 +2,7 @@@
  IMAGES=add.png edit.png	gear.png info.png menu.png \
  		notify_off.png star.png  delete.png feed.png group.png \
  		lock.png notice.png notify_on.png user.png link.png \
- 		play.png
 -		plugin.png
++		play.png plugin.png
  
  DESTS=10/ 16/ 22/ 48/ \
  		$(addprefix 10/, $(IMAGES)) \