friendica/images/icons/16/notify_off.png at f8f7cc9292e2f01637f0fec991229e8ffe16b83b

Alexander Kampmann 355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica

Conflicts:
	include/config.php
	update.php

2012-04-05 13:39:15 +02:00