Skip to content

Commit

Permalink
Merge branch 'master' into Visualisierungs_Bugfix
Browse files Browse the repository at this point in the history
# Conflicts:
#	web/server/src/server.cc
  • Loading branch information
maximilianruesch committed Jan 26, 2023
2 parents c816c47 + 11e49de commit 3d9764c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .pkg
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
[tiles]
[email protected]:motis-project/tiles.git
branch=master
commit=653637bd3fb595eaaca71d9a153ddfcc59930a8b
commit=6dc60472ba6b3270c2afb50f9905e86c8db7bff5
[rapidjson]
[email protected]:motis-project/rapidjson.git
branch=master
Expand Down

0 comments on commit 3d9764c

Please sign in to comment.