updating pre version
Merge branch 'master' of http://scm.ujaen.es/softuno/pictogram
Showing
with
1065 additions
and
1424 deletions
.htaccess
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
No preview for this file type
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.

4.83 KB

4.44 KB

1.96 KB

7.23 KB
android/Pictogram/docs/login.pdf
0 → 100644
No preview for this file type
android/Pictogram/docs/login.pptx
0 → 100644
No preview for this file type
nohup.out
deleted
100644 → 0
sails/INSTALL.md
deleted
100644 → 0
sails/README.md
0 → 100644
sails/conf/delete-test-data.sh
deleted
100644 → 0
sails/conf/installdb-autismojaen.sh
0 → 100755
sails/conf/installdb-test.sh
0 → 100755
sails/conf/installdb_caja.bat
deleted
100644 → 0
sails/conf/installdb_caja.sh
deleted
100755 → 0
File moved
sails/conf/pictodb-test.sql
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
The file could not be displayed because it is too large.
The file could not be displayed because it is too large.
sails/conf/tmp.sql
deleted
100755 → 0
sails/install.sh
0 → 100755
sails/src/Gruntfile.js.bak
deleted
100644 → 0
sails/src/INSTALL.md
deleted
100644 → 0
sails/src/api/models/#Student.js#
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
File mode changed
This diff is collapsed.
Click to expand it.
... | ... | @@ -33,5 +33,8 @@ |
"url": "http://scm.ujaen.es/softuno/pictogram.git" | ||
}, | ||
"author": "emblanco, amontejo", | ||
"license": "" | ||
"license": "", | ||
"devDependencies": { | ||
"node-inspector": "^0.12.8" | ||
} | ||
} |
sails/src/package.json~
deleted
100644 → 0
Please
register
or
sign in
to comment