summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_conflicts/mixins
Commit message (Expand)AuthorAgeFilesLines
* disable ESLint for all JavaScript fileswinniehell2016-10-262-0/+2
* Improve components for PhantomJs compatibilityAlfredo Sumaran2016-10-132-0/+30