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

..

images

Added flickr icon, updated twitter icon

2013-05-14 22:33:55 +10:00

javascripts

Merge branch 'dev' into payments-new

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

stylesheets

Tried to use Bootstrap datepicker. Failed!

2013-03-26 19:27:45 +11:00