Bechi 92cf4e82a3 fix conflict		2014-02-28 16:52:51 -03:00
..
angularjs-all.min.js	fix conflict	2014-02-28 16:52:51 -03:00
main.min.js	solve conflicts	2014-02-28 16:20:31 -03:00
vendors.min.js	added qr code scanner support	2014-02-28 16:18:06 -03:00