Michael Bianco da1a13f472 Merge branch 'funkensturm/master' into spree-1.0 ...

* funkensturm/master:
  Ruby 1.9.3 compatibility fix

2012-04-11 16:26:58 -04:00

..

controllers/spree

Ruby 1.9.3 compatibility fix

2012-04-05 12:25:43 +10:00

models/spree

Added preferences for click amount and valid days on digital links. Tests for authorization are now running

2012-03-31 11:07:52 -04:00

overrides

Forgot to save merged changed. Minor deface fix

2012-03-28 21:51:16 -04:00

views/spree

Using resource controller and namespace

2011-12-19 18:46:11 +01:00