gcampes acb8b1155b Merge conflicts		2017-03-20 15:00:04 -03:00
..
.meteor	Change how we load shared files from flash	2017-03-08 13:49:44 +00:00
client	Fix merge conflicts	2017-03-13 17:19:43 +00:00
imports	Merge conflicts	2017-03-20 15:00:04 -03:00
log
private	Merge conflicts	2017-03-20 15:00:04 -03:00
public	Updated icons in the html5 client	2017-03-01 17:03:02 -08:00
server	Refactor handlers inside /phone to the /user folder	2017-02-23 18:52:44 +00:00
tests	Fixed all the 120+ linter warnings	2016-06-27 11:24:37 -07:00
.gitignore	Add missing configuration file	2017-02-06 19:14:48 +00:00
.jscsrc
grunt-instructions.txt
Gruntfile.js	HTML5 - Adds more yaml, adds correct properties to objects in Gruntfile, cleans up logger.js	2016-08-23 14:35:28 -07:00
package.json	Fix merge conflicts	2017-03-13 17:19:43 +00:00
start.sh	clean up	2016-08-24 23:13:42 +00:00