Marco Quezada 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request il y a 10 ans
..
controllers 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request il y a 10 ans
factories 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request il y a 10 ans
app.js 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request il y a 10 ans