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