Vincent 75ba73e835 Merge branch 'hotfix/basicompta' into release/2.5 преди 9 месеца
..
Layout 75ba73e835 Merge branch 'hotfix/basicompta' into release/2.5 преди 9 месеца
Ui e35a052b1c fix merge conflicts преди 9 месеца