Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore:Removed Roomfinder #215

Merged
merged 9 commits into from
Oct 20, 2023
Prev Previous commit
Next Next commit
Merge branch 'main' into chore/remove-roomfinder-from-docs
# Conflicts:
#	client/go.mod
#	client/go.sum
#	server/api/tumdev/campus_backend.pb.go
#	server/api/tumdev/campus_backend.pb.gw.go
#	server/api/tumdev/campus_backend.proto
#	server/api/tumdev/campus_backend.swagger.json
#	server/api/tumdev/campus_backend_grpc.pb.go
#	server/backend/rpcserver.go
  • Loading branch information
CommanderStorm committed Oct 11, 2023
commit b33689701e6ecb74e53e98fd8dd54ff3b6cdd172
2 changes: 1 addition & 1 deletion client/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/TUM-Dev/Campus-Backend/client
go 1.21

require (
github.com/TUM-Dev/Campus-Backend/server v0.0.0-20230919162132-71bec88330f7
github.com/TUM-Dev/Campus-Backend/server v0.0.0-20231009133538-1a7f37e5f27c
github.com/sirupsen/logrus v1.9.3
google.golang.org/grpc v1.58.2
)
Expand Down
4 changes: 2 additions & 2 deletions client/go.sum
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
github.com/TUM-Dev/Campus-Backend/server v0.0.0-20230919162132-71bec88330f7 h1:TDgiN5Z1vi3V0Qo94MIXURiD9+U7TGiRtiUIqN/rulo=
github.com/TUM-Dev/Campus-Backend/server v0.0.0-20230919162132-71bec88330f7/go.mod h1:fjoLL3rbdY6wTRJIksekT2p3OUp5ocFfXjB/avV/TVI=
github.com/TUM-Dev/Campus-Backend/server v0.0.0-20231009133538-1a7f37e5f27c h1:mk107j91labFDRf5kN3MKJIZpw4Xn63ou27qrygAkKQ=
github.com/TUM-Dev/Campus-Backend/server v0.0.0-20231009133538-1a7f37e5f27c/go.mod h1:wrzx8AE9r2dpCuXTcm36XIUQLBAnOH21Hsnt0mpxPbQ=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.