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
..
fancybox	After applying known rules in diaspora-bundle.spec, perm-fix patch + *.png	2010-10-07 14:59:13 +02:00
jquery.cycle	After applying known rules in diaspora-bundle.spec, perm-fix patch + *.png	2010-10-07 14:59:13 +02:00
aspect-edit.js	add new aspect back on manage page. changed badges	2010-10-18 11:00:52 -07:00
FABridge.js	working websocket	2010-06-19 00:09:58 -07:00
fileuploader.js	Fixing bad execute permissions on various *.html, *.js, *.css,*.png etc.	2010-10-06 04:59:46 +08:00
image_picker.js	Add or later to license notice	2010-10-07 16:25:34 -07:00
jquery-1.4.2.min.js	Adding minified jquery	2010-08-25 18:20:21 -07:00
jquery-ui-1.8.4.custom.min.js	droping things	2010-08-25 21:53:04 -07:00
jquery.infieldlabel.js	Fixing bad execute permissions on various *.html, *.js, *.css,*.png etc.	2010-10-06 04:59:46 +08:00
jquery142.js	swaped out js for jquery	2010-06-15 09:53:19 -07:00
rails.js	minor tab tweaks	2010-08-24 16:38:42 -07:00
stream.js	Revert "Merge remote branch 'upstream/master'"	2010-10-20 14:59:55 +02:00
swfobject.js	working websocket	2010-06-19 00:09:58 -07:00
view.js	Revert "Merge remote branch 'upstream/master'"	2010-10-20 14:59:55 +02:00
web_socket.js	Fixing bad execute permissions on various *.html, *.js, *.css,*.png etc.	2010-10-06 04:59:46 +08:00
WebSocketMain.swf	working websocket	2010-06-19 00:09:58 -07:00