Don’t prefix methods with `self`
Merge pull request #5 from hyperoslo/refactor/dont-prefix-self

Don’t prefix methods with `self`
Add norwegian localization
Merge pull request #7 from hyperoslo/feature/norwegian-localization

Add norwegian localization
Don't list blocked items
Reference class methods by :: rather than .
Merge pull request #8 from hyperoslo/fix/blocked

Don't list blocked items
Kaminari and will_paginate collision
Merge pull request #9 from route/master

Kaminari and will_paginate collision
Add guard
Feed filter by scopes
Update readme
Fix typo
Merge pull request #11 from hyperoslo/new-filter

Fix #3: filter scope accept ActiveRecord relations and model classes
Update readme
Replace observers with callbacks
Merge pull request #10 from route/master

Replace observers with callbacks
Lock rspec-rails dependency to ~> 2.99
Don't include AuthorizationHelpers in ItemsHelper
Merge branch 'master' into feature/recommended-items

Conflicts:
	feeder.gemspec
	lib/feeder.rb
	lib/feeder/configuration.rb
	spec/dummy/db/schema.rb