Merge remote branch 'upstream/manage-ui' into ui
authorFrancisco Rodriguez <francisco.rodriguez@finario.com>
Mon, 21 Mar 2011 19:49:58 +0000 (14:49 -0500)
committerFrancisco Rodriguez <francisco.rodriguez@finario.com>
Mon, 21 Mar 2011 19:49:58 +0000 (14:49 -0500)
commit15566ad810e43657154f5756e7f1aee39bd04d85
tree4cdbc8e4bb4d727ec7f99090c9feab1241c40129
parentcd6083fc3550fbca5758fa8d61d29d6d9b0fcf54
parent720fe6ba8462ec55ffd9c51a4d4b28a2b2820df1
Merge remote branch 'upstream/manage-ui' into ui
config/routes.rb