Jonne Haß bef05c14d7 Merge branch '3681-infinite-scroll-on-contact-page' of git://github.com/asphxia/diaspora into develop ... Conflicts: Changelog.md		2013-04-10 18:24:47 +02:00
..
controllers	Always redirect user to downcase version of tags on UTF-8 encoding	2013-04-10 00:08:58 -03:00
fixtures
helpers	Spec coverage for changelog_url and adjustment to behaviour	2013-02-04 11:00:57 +08:00
integration	Bye Resque. Ohai Sidekiq.	2013-03-21 23:39:07 +01:00
javascripts	Merge branch '3681-infinite-scroll-on-contact-page' of git://github.com/asphxia/diaspora into develop	2013-04-10 18:24:47 +02:00
lib	Bye Resque. Ohai Sidekiq.	2013-03-21 23:39:07 +01:00
mailers
models	Merge pull request #3993 from MrZYX/sidekiq	2013-04-03 15:19:15 -07:00
presenters	bootstrap my_aspects data	2013-01-16 19:33:20 -02:00
shared_behaviors	remove unnecesary stuff from specs	2012-11-21 18:26:17 -02:00
support	Bye Resque. Ohai Sidekiq.	2013-03-21 23:39:07 +01:00
workers	Bye Resque. Ohai Sidekiq.	2013-03-21 23:39:07 +01:00
factories.rb
helper_methods.rb
locale_spec.rb
misc_spec.rb
spec-doc.rb
spec_helper.rb	Bye Resque. Ohai Sidekiq.	2013-03-21 23:39:07 +01:00