danielgrippi 9b941e6520 Bookmark now consumes cubbi.es JSON, cubbi.es things can be saved to Diaspora, but are not displayed.		2011-05-19 11:57:06 -07:00
..
config
controllers	added token authenticatable to user model	2011-05-19 11:57:06 -07:00
fixtures
helpers	Revert to including all helpers everywhere, because the rest of the team prefers it that way	2011-05-12 13:54:55 -07:00
integration
javascripts
lib
mailers	Revert "added a podwide email preference"	2011-05-18 10:38:45 -07:00
models	Bookmark now consumes cubbi.es JSON, cubbi.es things can be saved to Diaspora, but are not displayed.	2011-05-19 11:57:06 -07:00
shared_behaviors
support	Merge branch 'master' into follow	2011-05-16 14:56:28 -07:00
factories.rb
helper_methods.rb
misc_spec.rb
spec_helper.rb