2 commits

Author	SHA1	Message	Date
Luke "Jared" Bennett	3eb8569778	Correct merge conflicts ... Fixed eslint failures	2017-01-10 12:30:39 -06:00
Alfredo Sumaran	088368ae4d	Add date.format.js	2016-04-07 11:59:56 -05:00