Commit d9e1083d authored by Reza Sahebgharan's avatar Reza Sahebgharan

Merge branch 'master' into 'staging_hisworklist'

# Conflicts:
#   .gitlab-ci.yml
#   docker-compose.yml
#   imports/api/collections/worklist4hislink.js
parents bceff326 2c9af4db
Pipeline #884 passed with stage
in 15 minutes and 18 seconds
......@@ -30,6 +30,8 @@ if (Meteor.isClient || Meteor.isCordova) {
collections[collName] = new Mongo.Collection(collName);
}
});
}
export default collections;
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment