Skip to content

Commit

Permalink
Merge branch 'develop' into fix/mocks-for-user-controller
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/user-service/user/default_controller_test.go
  • Loading branch information
Dorien Grönwald committed Jan 8, 2024
2 parents 3d0f72c + b91eb24 commit 02f361f
Show file tree
Hide file tree
Showing 9 changed files with 53 additions and 2,414 deletions.
1,718 changes: 0 additions & 1,718 deletions lib/rpc/shoppinglist/shoppinglist.pb.go

This file was deleted.

144 changes: 0 additions & 144 deletions lib/rpc/shoppinglist/shoppinglist.proto

This file was deleted.

Loading

0 comments on commit 02f361f

Please sign in to comment.