# Conflicts: # js/planner.js
Merge pull request 'akus_schabernack2' (#2) from akurosia/ff14-mitigator:akus_schabernack2 into master
Description
FFXIV Mitigation Analyzer — FFLogs OAuth2 + AoE Timeline
Languages
JavaScript
56.2%
PHP
26.3%
CSS
15.6%
Hack
1.9%