Commit Graph

4 Commits

Author SHA1 Message Date
Zach Prezkuta 127b7a589e eliminate Cropper conflicts with jQuery 2013-06-01 10:42:51 -06:00
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
Friendika 0b221e8945 bug move libraries to library - better alignment of like rotator 2011-06-28 21:11:52 -07:00