Commit Graph

52 Commits

Author SHA1 Message Date
friendica
2212ddb913 use icons for identification 2014-04-11 23:54:11 -07:00
friendica
196b3022bd Merge branch 'master' into movejs
Conflicts:
	version.inc
2014-01-06 02:37:06 -08:00