22 Jan, 2014

1 commit


22 Nov, 2013

1 commit


22 Jul, 2013

1 commit


15 Jul, 2013

1 commit


21 May, 2013

5 commits


17 May, 2013

1 commit


16 May, 2013

1 commit


13 May, 2013

1 commit


09 May, 2013

2 commits


07 May, 2013

1 commit


29 Apr, 2013

1 commit


16 Apr, 2013

1 commit


15 Apr, 2013

3 commits


12 Apr, 2013

1 commit


10 Apr, 2013

1 commit


05 Apr, 2013

2 commits


25 Mar, 2013

1 commit


14 Mar, 2013

1 commit


13 Mar, 2013

3 commits


12 Mar, 2013

1 commit


07 Mar, 2013

1 commit


05 Mar, 2013

1 commit


04 Mar, 2013

1 commit


26 Jan, 2013

3 commits


23 Jan, 2013

1 commit


22 Jan, 2013

1 commit


19 Jan, 2013

1 commit


17 Jan, 2013

1 commit

  • Conflicts:
    	plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
    	plugins/shopping_cart/lib/shopping_cart_plugin.rb
    	plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb
    	plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb
    	plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb
    	plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb
    Rodrigo Souto