3 commits

Author	SHA1	Message	Date
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
tommy tomson	0f3255467e	fixed login-fields, fixed. notofication.png, changed locations	2012-03-10 13:22:41 +01:00
tommy tomson	c26787ab94	adjust2	2012-03-02 17:18:11 +01:00