Merge branch 'develop' of http://gitlab.ujaen.es/yotta/pictogram into develop
Showing
with
1311 additions
and
495 deletions

62.4 KB
This diff is collapsed.
Click to expand it.

45.9 KB

45.9 KB

42.2 KB

45.9 KB

45.9 KB

108 KB

414 KB

108 KB
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
sails/src/assets/scripts/check_browser.js
0 → 100644
sails/src/assets/scripts/modules/login/views/login.html
100755 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
sails/src/node_modules_overwrite/README.md
0 → 100644
This diff is collapsed.
Click to expand it.
... | @@ -41,7 +41,7 @@ | ... | @@ -41,7 +41,7 @@ |
"main": "app.js", | "main": "app.js", | ||
"repository": { | "repository": { | ||
"type": "git", | "type": "git", | ||
"url": "http://scm.ujaen.es/softuno/pictogram.git" | "url": "http://gitlab.ujaen.es/yotta/pictogram.git" | ||
}, | }, | ||
"author": "Yottacode", | "author": "Yottacode", | ||
"license": "", | "license": "", | ||
... | ... |
Please
register
or
sign in
to comment