| commit | 41c6875ee35250446ecbf6c7d7d0876ad51780da | |
| author | Alex Coles <alexbcoles@mac.com> | |
| Sat, 31 May 2008 13:08:19 +0000 (31 15:08 +0200) | ||
| committer | Alex Coles <alexbcoles@mac.com> | |
| Sat, 31 May 2008 13:08:19 +0000 (31 15:08 +0200) | ||
| tree | c1fcc05e56d6ff972cb9af4afcc1f7087fd89f7c | treesnapshot (tar.gz zip) |
| parent | eca5dfd9ce428a4e4dae7ccb5509e45a3c430c76 | commitdiff |
| parent | 8655c0decb32d4159161863dc96d882c6bc33f75 | commitdiff |
Merge commit 'ben/master'
Conflicts:
.gitignore
README
Rakefile
TODO
app/controllers/application.rb
app/models/address.rb
app/models/country.rb
app/models/order.rb
app/models/state.rb
app/models/user.rb
public/stylesheets/master.css
spec/models/address_spec.rb
spec/models/country_spec.rb
spec/models/order_spec.rb
spec/models/state_spec.rb
spec/models/user_spec.rb
spec/spec_helper.rb
Conflicts:
.gitignore
README
Rakefile
TODO
app/controllers/application.rb
app/models/address.rb
app/models/country.rb
app/models/order.rb
app/models/state.rb
app/models/user.rb
public/stylesheets/master.css
spec/models/address_spec.rb
spec/models/country_spec.rb
spec/models/order_spec.rb
spec/models/state_spec.rb
spec/models/user_spec.rb
spec/spec_helper.rb
15 files changed: