4 commits

Author	SHA1	Message	Date
Jonne Haß	088446e86e	bump rspec-rails, remove deprecated rspec syntax	2012-09-11 00:46:36 +02:00
danielgrippi	5df6bc1adf	block user now removes a contact if user is blocking a contact	2011-11-03 12:31:24 -07:00
danielgrippi	ae7944418c	DH DG; made privacy page; can now unblock a user; users are actually being blockocked in ajaxed streams	2011-11-03 12:31:24 -07:00
Dan Hansen	16e76886d9	wip	2011-11-03 12:31:24 -07:00