Start merging current data with distant data

2016-06-10 19:23:11 +02:00
parent bd936322ef
commit 237ce7f4e1
8 changed files with 258 additions and 40 deletions
@@ -47,7 +47,7 @@ application.controller(
            {
                $scope.$apply( function()
                {
-                    $scope.project = data;
+                    $scope.project = project.data;
                } );
            } );