Commit Graph
17 Commits
Author SHA1 Message Date
cato447 dd2cbebec8 removed test file 2022-06-05 19:41:33 +02:00
cato447 046dd46c87 Merge branch 'dev' into main 2022-06-05 19:33:54 +02:00
cato447 2dd5de3672 Merge remote-tracking branch 'origin/dev' into dev 2022-06-05 19:31:23 +02:00
cato447 90336db581 Merge branch 'main' into dev 2022-06-05 19:24:37 +02:00
cato447 ba8bf8527e testing merge conflicts on main 2022-06-05 19:20:21 +02:00
cato447 6460388784 testing merge conflicts 2022-06-05 19:19:52 +02:00
cato447 6bcf913cea testing push pipeline 2022-06-05 19:17:51 +02:00
cato447 7621ab15d6 Merge branch 'main' into dev 2022-06-05 18:31:51 +02:00
cato447 5e63f0252d Merge branch 'main' into dev 2022-06-05 17:31:47 +02:00
cato447 f6e1373a46 added sync test action 2022-06-05 17:24:08 +02:00
cato447 d609f56d35 Merge branch 'main' into dev 2022-06-05 12:26:49 +02:00
cato447 7d31835d1a Updated readme 2022-06-05 11:53:29 +02:00
cato447 2816ae7176 copied gitfiles and gradlew.bat from bitbucket 2022-06-05 11:45:01 +02:00
cato447 d16b7d8f1b updated bitbucket-sync.yml 2022-06-05 10:38:00 +02:00
cato447 6d62f472fc removed unused file 2022-06-03 15:43:55 +02:00
cato447 f5fc1f4f8c Merge branch 'main' into dev 2022-06-02 20:20:04 +02:00
cato447 f0ce8a615b changed base path of REST api and updated frontend api quering 2022-06-02 19:08:10 +02:00