diaspora/spec/models/user
danielgrippi 7eaca0346c Merge branch 'master' into follow
Conflicts:
	config/assets.yml
	public/stylesheets/sass/_mixins.scss
	spec/models/user/posting_spec.rb
2011-05-16 14:56:28 -07:00
..
attack_vectors_spec.rb Merge branch 'master' into follow 2011-05-04 11:35:35 -07:00
connecting_spec.rb added a pane for people sharing with you on all aspect page 2011-05-04 17:57:42 -07:00
invite_spec.rb added mutual flag, removed pending from contact, specs are green. wip 2011-04-05 16:12:53 -07:00
posting_spec.rb Merge branch 'master' into follow 2011-05-16 14:56:28 -07:00
querying_spec.rb Merge branch 'master' into follow 2011-05-04 11:35:35 -07:00