2 Commits

Author	SHA1	Message	Date
Seth Call	510d157262	* upgrade to Rails 4 as well as support JjamBlaster	2016-07-17 10:16:27 -05:00
Seth Call	d83a632d0b	Conflicts: ... db/manifest web/app/assets/javascripts/jam_rest.js	2014-12-18 15:13:55 -06:00