config changes
config changes
config changes
config changes
config changes
fixed broken url
Merge branch 'master' of https://github.com/gg-trickitty/ejero

Conflicts:
	app/styles/main.scss
Merge branch 'master' of https://github.com/gg-trickitty/ejero
fixed paths