Alex Moreno 65df9b87e7 fix: conflicts		2023-02-13 13:22:53 +01:00
..
core	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-02-09 09:16:30 +01:00
salix	fix: conflicts	2023-02-13 13:22:53 +01:00
Dockerfile	removed offset from agency module	2019-02-25 14:02:47 +01:00
module-import.js	Resolved conflicts	2022-08-10 12:13:31 +02:00
nginx.conf	Prevent index caching, automatic docker ports	2020-01-29 14:43:15 +01:00
package-lock.json	refactor(invoiceOut): updated translation	2023-01-05 11:43:08 +01:00
package.json	feat(calendar): component shows now the year week numbers	2021-09-16 12:13:20 +02:00