Skip to content
Snippets Groups Projects
Unverified Commit 342257a3 authored by Gabriel Engel's avatar Gabriel Engel
Browse files

Merge branch 'ziedmahdi-integration' into develop

parents cb29657a 5d0638aa
No related branches found
No related tags found
No related merge requests found
...@@ -186,4 +186,4 @@ Package.onTest(function(api) { ...@@ -186,4 +186,4 @@ Package.onTest(function(api) {
api.use('sanjo:jasmine@0.20.2'); api.use('sanjo:jasmine@0.20.2');
api.use('rocketchat:lib'); api.use('rocketchat:lib');
api.addFiles('tests/jasmine/server/unit/models/_Base.spec.coffee', 'server'); api.addFiles('tests/jasmine/server/unit/models/_Base.spec.coffee', 'server');
}); });
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment