Merge branch 'master' of github.com:MPR-Global/metadata into apache-local
Conflicts:
dashboard/v2/public/modules/details/detailsResource.js
dashboard/v2/public/modules/lineage/lineageResource.js
dashboard/v2/public/modules/search/searchResource.js
Showing
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
dashboard/v2/public/img/ApacheAtlasLogo.png
0 → 100644
3.04 KB
dashboard/v2/public/img/favicon.ico
100755 → 100644
No preview for this file type
dashboard/v2/public/img/process.png
100755 → 100644
File mode changed from 100755 to 100644
dashboard/v2/public/img/spinner.gif
0 → 100644
8.08 KB
dashboard/v2/public/img/tableicon.png
0 → 100755
478 Bytes
dashboard/v2/public/modules/details/detailsController.js
100755 → 100644
dashboard/v2/public/modules/details/detailsModule.js
100755 → 100644
File mode changed from 100755 to 100644
dashboard/v2/public/modules/details/detailsResource.js
100755 → 100644
dashboard/v2/public/modules/details/detailsRoutes.js
100755 → 100644
File mode changed from 100755 to 100644
dashboard/v2/public/modules/details/views/attribute.html
100755 → 100644
dashboard/v2/public/modules/details/views/details.html
100755 → 100644

This diff is collapsed.
Click to expand it.
File added
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.