Changeset [64a87a1419c0b79af0bd09cee5edad3c8aa98e67] by Shawn Balestracci
Revision 64a87a1419c0b79af0bd09cee5edad3c8aa98e67,
committed by Shawn Balestracci
· May 14th, 2012 @ 03:35 PM
Merge branch 'master' into wip
Conflicts:
app/views/login/_whats_new.html.erb
https://github.com/vegantech/sims/commit/64a87a1419c0b79af0bd09cee5...
2 changed files
-
M
app/views/login/_whats_new.html.erb -
M
wip.txt