Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Robert Waltemath 2012-11-13 08:55:50 +01:00
commit c032fdca6e
5 changed files with 2 additions and 13 deletions

View file

@ -9,9 +9,6 @@ class SharedSupplier < ActiveRecord::Base
has_one :supplier
has_many :shared_articles, :foreign_key => :supplier_id
# save the lists as an array
serialize :lists
end
# == Schema Information