Skud 89a5a777e6 Merge branch 'dev' into payments-new ...

Conflicts:
	.gitignore
	app/models/ability.rb
	app/models/member.rb
	db/schema.rb

2013-06-04 19:42:00 +10:00

..

migrate

Merge branch 'dev' into payments-new

2013-06-04 19:42:00 +10:00

seeds

Fixed tests by getting rid of valid_session

2012-11-26 19:04:43 +11:00

schema.rb

Merge branch 'dev' into payments-new

2013-06-04 19:42:00 +10:00

seeds.rb

added account type and paid months columns to product

2013-05-18 10:27:08 +10:00