Changeset [2003c088d7f39d2ff7109895ebdc0bd9b8e15151] by Shawn Balestracci
Revision 2003c088d7f39d2ff7109895ebdc0bd9b8e15151,
committed by Shawn Balestracci
· January 2nd, 2013 @ 10:05 PM
Merge branch 'master' into jquery
Conflicts:
Gemfile.lock
https://github.com/vegantech/sims/commit/2003c088d7f39d2ff7109895eb...
2 changed files
-
M
Gemfile -
M
Gemfile.lock