Merge with master

sir-dunxalot · May 22, 2016 · e988b28 · e988b28
2 parents 9128d19 + 2935cb2
commit e988b28
Show file tree

Hide file tree

Showing 14 changed files with 1 addition and 115 deletions.
diff --git a/index.js b/index.js
@@ -7,4 +7,5 @@ module.exports = {
   included: function(app) {
     this._super.included(app); // For ember-cli-sass
   }
+
 };
diff --git a/tests/dummy/app/controllers/tooltip-manual-trigger.js b/tests/dummy/app/controllers/tooltip-manual-trigger.js
diff --git a/tests/dummy/app/controllers/tooltip-on-helper.js b/tests/dummy/app/controllers/tooltip-on-helper.js
diff --git a/tests/dummy/app/controllers/tooltip-with-safestring.js b/tests/dummy/app/controllers/tooltip-with-safestring.js
diff --git a/tests/dummy/app/initializers/components.js b/tests/dummy/app/initializers/components.js
diff --git a/tests/dummy/app/snippets/tooltip-as-component.hbs b/tests/dummy/app/snippets/tooltip-as-component.hbs
diff --git a/tests/dummy/app/snippets/tooltip-auto-close-1.hbs b/tests/dummy/app/snippets/tooltip-auto-close-1.hbs
diff --git a/tests/dummy/app/snippets/tooltip-auto-close-2.hbs b/tests/dummy/app/snippets/tooltip-auto-close-2.hbs
diff --git a/tests/dummy/app/snippets/tooltip-manual-trigger-1.hbs b/tests/dummy/app/snippets/tooltip-manual-trigger-1.hbs
diff --git a/tests/dummy/app/snippets/tooltip-manual-trigger-2.hbs b/tests/dummy/app/snippets/tooltip-manual-trigger-2.hbs
diff --git a/tests/dummy/app/snippets/tooltip-on-element.hbs b/tests/dummy/app/snippets/tooltip-on-element.hbs
diff --git a/tests/dummy/app/snippets/tooltip-on-helper-1.hbs b/tests/dummy/app/snippets/tooltip-on-helper-1.hbs
diff --git a/tests/dummy/app/snippets/tooltip-on-helper-2.hbs b/tests/dummy/app/snippets/tooltip-on-helper-2.hbs
diff --git a/tests/unit/.gitkeep b/tests/unit/.gitkeep
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,4 +7,5 @@ module.exports = { @@
       included: function(app) {
         this._super.included(app); // For ember-cli-sass
       }
     };