[forge-commits] [forge/website] f3d08d: Conflict merge of app/index.html

Branch: refs/heads/js-update Home: https://github.com/forge/website Commit: f3d08d3d68d659ec34b7c55d592bb711c749db79 https://github.com/forge/website/commit/f3d08d3d68d659ec34b7c55d592bb711c... Author: visuale <james(a)visuale.net&gt; Date: 2015-08-18 (Tue, 18 Aug 2015) Changed paths: M app/index.html Log Message: ----------- Conflict merge of app/index.html