Merge master/resolved conflicts

This commit is contained in:
MrCasual
2015-08-13 12:26:14 -04:00
parent ed3e3b0eb8
commit 9c80429d0d
16 changed files with 3230 additions and 1032 deletions

View File

@@ -0,0 +1,7 @@
define('testAjax', [ 'mailpoet', 'ajax'], function(MailPoet) {
describe('Ajax submodule', function() {
it('has a version', function() {
expect(MailPoet.Ajax.version).to.be.a('number');
});
});
});