Commit graph

8 commits

Author SHA1 Message Date
cri
350600b1b9 change direcory to occupy mordor 2015-09-12 20:37:43 +02:00
cek
f76829f2f5 sistemato 2015-09-12 20:32:35 +02:00
cek
c79b67144a Merge remote-tracking branch 'origin/master'
Conflicts:
	app/scripts/arkiwi.js
	app/scripts/main.js
2015-09-12 20:18:43 +02:00
cek
0b813f899f commit 2015-09-12 20:15:55 +02:00
cri
f6e082a268 modifiche stile e cambio cartella letta da arkiwi 2015-09-12 20:14:53 +02:00
cri
fc0c1d0298 sincro file con quelle caricate sul server 2015-09-12 18:35:18 +02:00
cri
7693a3d3eb aggiunta var diopporco 2015-09-12 18:27:49 +02:00
cri
82e8e83c03 app abbozzata 2015-08-11 16:48:05 +02:00