Skip to content

Commit 195964d

Browse files
authored
Merge branch 'develop' into HotFix_api_report_2
2 parents eb68d2f + 27504ef commit 195964d

File tree

93 files changed

+15203
-11150
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+15203
-11150
lines changed

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,7 @@ hs_err_pid*
2626
.DS_Store
2727

2828
# Examples
29-
pruebas/
29+
pruebas/
30+
31+
# Docker compose database
32+
postgresql/

0 commit comments

Comments
 (0)