mirror of
https://github.com/LaCasemate/fab-manager.git
synced 2025-02-26 20:54:21 +01:00
fix conflit
This commit is contained in:
commit
04cca4bbff
@ -1,5 +1,5 @@
|
||||
---
|
||||
nb:
|
||||
"no":
|
||||
activerecord:
|
||||
errors:
|
||||
messages:
|
||||
|
Loading…
x
Reference in New Issue
Block a user