Joan Sanchez e15d724db5 Merge pull request 'closes #3681 move-sign_save-to-salix' (!1151) from 3681-move-sign_save-to-salix into dev ... Reviewed-on: #1151 Reviewed-by: Joan Sanchez <joan@verdnatura.es>		2022-12-22 12:44:01 +00:00
..
core	Merge branch 'dev' into 4531-monitor_duplicates	2022-12-22 10:37:48 +00:00
salix	Merge branch 'dev' into 4791-refactor-sendsms	2022-12-20 11:01:38 +00: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	Merge branch 'dev' into 3681-move-sign_save-to-salix	2022-11-16 12:26:59 +01:00
package.json	feat(calendar): component shows now the year week numbers	2021-09-16 12:13:20 +02:00