David Leonard b2109e8e40 Updating AngularJS Front-end %!s(int64=10) %!d(string=hai) anos
..
controllers 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request %!s(int64=10) %!d(string=hai) anos
factories 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request %!s(int64=10) %!d(string=hai) anos
app.js b2109e8e40 Updating AngularJS Front-end %!s(int64=10) %!d(string=hai) anos