Commit Graph

4 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
friendica 8aa2552372 add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) 2012-01-18 16:21:30 -08:00
zottel 720787b772 Switch to jquery 1.7.1 2011-12-12 08:11:35 -08:00
Fabio Comuni 14125ce67b Add tipTip js tooltips 2011-09-05 11:32:40 +02:00