william
pushed to feature/18-add-existing-files-cache at ColorRecipesExplorer/Backend
2021-12-31 14:56:43 -05:00
eae3aecb31
#18 Start cache
fa8052d053
Merge branch '17-unmodifiable-system-material-types' into feature/18-add-existing-files-cache
Prevent edition of system material types
b92238e473
Merge pull request 'CI/CD' (#24) from develop into master
941d3134f6
CI/CD
Multiple bug fixes
fb725a58f1
Merge pull request 'Multiple bug fixes' (#23) from develop into master
fefdd50870
CI/CD
a178ef81c8
CI/CD
c21a763160
CI/CD
546d1f5330
Merge remote-tracking branch 'origin/develop' into develop
Multiple bug fixes
af3b8eee8c
Merge remote-tracking branch 'origin/develop' into develop
f21157d283
Fix mix editor did not get the materials from the correct location in update mode
william
deleted branch 12-user-info-jwt from ColorRecipesExplorer/Frontend
2021-12-22 16:27:48 -05:00
0960eaa507
Merge pull request '12-user-info-jwt' (#6) from 12-user-info-jwt into develop
f04a3c7ba3
Fix mix editor did not get the materials from the correct location in update mode
82cb974d27
CI/CD
d239d37e66
Remote login/logout old components