nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/spec/lib
History
Alec Leamas 1481056af2 Revert "Merge remote branch 'upstream/master'" 
This reverts commit fb70dc8c99, reversing
changes made to 53fef63a9a.

Conflicts:

	pkg/fedora/diaspora-setup
	pkg/ubuntu/diaspora-setup
	public/stylesheets/sass/application.sass
	spec/models/user/attack_vectors_spec.rb
2010-10-20 14:59:55 +02:00
..
diaspora_parser_spec.rb Revert "Merge remote branch 'upstream/master'" 2010-10-20 14:59:55 +02:00
exporter_spec.rb Revert "Merge remote branch 'upstream/master'" 2010-10-20 14:59:55 +02:00
hcard_spec.rb stop the file include madness. using File.join and Rails.root for includes everywhere I could 2010-10-10 11:54:08 -07:00
message_handler_spec.rb Add or later to license notice 2010-10-07 16:25:34 -07:00
ostatus_builder_spec.rb stop the file include madness. using File.join and Rails.root for includes everywhere I could 2010-10-10 11:54:08 -07:00
salmon_salmon_spec.rb Add or later to license notice 2010-10-07 16:25:34 -07:00
web_hooks_spec.rb Add or later to license notice 2010-10-07 16:25:34 -07:00
websocket_spec.rb Add or later to license notice 2010-10-07 16:25:34 -07:00