Update from master

# Conflicts:
#	ng2-components/ng2-alfresco-datatable/package.json
#	ng2-components/ng2-alfresco-documentlist/package.json
This commit is contained in:
Denys Vuika
2016-07-05 12:56:04 +01:00
16 changed files with 195 additions and 33 deletions

View File

@@ -1,7 +1,7 @@
{
"name": "ng2-alfresco-datatable",
"description": "Alfresco Angular2 DataTable Component",
"version": "0.1.17",
"version": "0.0.0-PLACEHOLDER",
"author": "Alfresco Software, Ltd.",
"scripts": {
"clean": "rimraf dist node_modules typings",
@@ -68,7 +68,7 @@
"rxjs": "5.0.0-beta.6",
"zone.js": "0.6.12",
"rimraf": "2.5.2",
"ng2-alfresco-core": "^0.1.35"
"ng2-alfresco-core": "0.0.0-PLACEHOLDER"
},
"peerDependencies": {
"material-design-icons": "^2.2.3",