diff options
| author | Loic GUEGAN <loic@Manzerbredes.home> | 2016-04-27 17:03:29 +0200 |
|---|---|---|
| committer | Loic GUEGAN <loic@Manzerbredes.home> | 2016-04-27 17:03:29 +0200 |
| commit | 9a93133272efc239368252bbf4e0eee1791fd911 (patch) | |
| tree | b6e1a94cd103bf5c33e3e735d72f463cfe56950b /client/index.html | |
| parent | 3c72415dcda4ca43a2adf9a0254d51cc6ce196c3 (diff) | |
| parent | 1cdc04c5f10d57e56a049481d53c3f1006229fcb (diff) | |
Merge branch 'loic-image-edition' into loic
Diffstat (limited to 'client/index.html')
| -rwxr-xr-x | client/index.html | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/client/index.html b/client/index.html index 43659d0..d04955c 100755 --- a/client/index.html +++ b/client/index.html @@ -26,6 +26,7 @@ <div ng-include="'./partials/home/machineDetails.html'"></div> <div ng-include="'./partials/loading.html'"></div> <div ng-include="'./partials/image/upload.html'"></div> + <div ng-include="'./partials/image/edit.html'"></div> <!-- MAIN GRID --> @@ -95,6 +96,8 @@ <script src="./js/controllers/network/network.js"></script> <script src="./js/controllers/image/image.js"></script> <script src="./js/controllers/image/upload.js"></script> + <script src="./js/controllers/image/edit.js"></script> + <!-- Includes and dependencies for jointJS --> |