Merge remote branch 'origin/groups-index'
authorDavid A. Cuadrado <krawek@gmail.com>
Mon, 3 May 2010 07:20:02 +0000 (02:20 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Mon, 3 May 2010 07:20:02 +0000 (02:20 -0500)
commit37de735f800ebda69c99096a0831737dda5cbed5
treef8439f833d5afdbeec1f5b493cd96c90b45be415
parent12bf095bd6e14fc3d1a03356659e8120ff6e2710
parent17244750fdddd5b918aa8da3a63479753c1ed050
Merge remote branch 'origin/groups-index'
app/models/group.rb
config/asset_packages.yml