Changeset [41c85ea8edf001d67e15e3a468fd3feeceaaae32] by Shawn Balestracci
Revision 41c85ea8edf001d67e15e3a468fd3feeceaaae32,
committed by Shawn Balestracci
· February 4th, 2013 @ 04:42 PM
Merge branch 'back_to_prototype'
Conflicts:
Gemfile.lock
https://github.com/vegantech/sims/commit/41c85ea8edf001d67e15e3a468...
1 changed file
-
M
Gemfile.lock