Merge branch 'master' into dev-denys-340

# Conflicts:
#	ng2-components/ng2-alfresco-datatable/package.json
#	ng2-components/ng2-alfresco-documentlist/package.json
This commit is contained in:
Denys Vuika
2016-07-06 13:06:31 +01:00
14 changed files with 90 additions and 40 deletions

View File

@@ -1,7 +1,7 @@
{
"name": "ng2-alfresco-datatable",
"description": "Alfresco Angular2 DataTable Component",
"version": "0.0.0-PLACEHOLDER",
"version": "0.2.0",
"author": "Alfresco Software, Ltd.",
"scripts": {
"clean": "rimraf dist node_modules typings",