| Age | Commit message (Collapse) | Author |
|
|
|
Conflicts:
client/index.html
client/js/controllers/home/home.js
client/partials/home/home.html
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
server/core/LibOverride/genTokenOptions.php
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
into develop
|
|
|
|
essaie pour angularjs notamement extraction des donnée
|
|
|