Skip to content
Snippets Groups Projects
Commit f21e912a authored by François Bobot's avatar François Bobot
Browse files

Merge remote-tracking branch 'origin/master' into feature/bobot/jbuilder

parents 7ad28b92 96b2cdc5
No related branches found
No related tags found
No related merge requests found
Showing
with 51 additions and 33 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment