Connor Turland 72fd2717b6 Merge branch 'develop' into feature/convo.algo		2017-02-05 05:26:58 +00:00
..
lib	Merge branch 'develop' into feature/convo.algo	2017-02-05 05:26:58 +00:00
application.js	revert back to jquery 1 to fix best in place	2017-01-23 19:50:59 -05:00
homepageVimeoFallback.js	fix codeclimate style issues (#1046)	2017-01-23 19:30:13 -05:00
Metamaps.ServerData.js.erb	remove Metamaps.Erb	2016-11-07 14:55:20 -05:00