Commit 394405e7 by Sebastián Collado Montañez

Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop

parents fb6b840e b99355a3
......@@ -11,7 +11,9 @@ module.exports = {
* @param {response} res {}
*/
ping: function (req, res) {
res.ok();
res.ok({
version: sails.config.pictogram
});
},
/**
......@@ -21,6 +23,8 @@ module.exports = {
* @param {response} res {}
*/
ping_session: function (req, res) {
res.ok();
res.ok({
version: sails.config.pictogram
});
}
};
......@@ -5,6 +5,7 @@ var ASSETS_PATH = path.join(__dirname, '..', 'assets');
var UPLOAD_PATH = path.join(__dirname, '..', '..', 'upload');
module.exports.pictogram = {
version: "0.1", // actual version of the server, to be checked by the client
admin: {
email: 'amontejo@ujaen.es',
password: '$2a$06$flEEOc15SerMeYWARrN9w.KSpJuM.jDsaTgrtD0ESzbxKHPl0f/zq' //y00ttaa!!
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment