An error occurred while fetching the assigned milestone of the selected merge_request.
added legend for mensa and vegan leaf
Compare changes
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
+ 4
− 3
@@ -40,7 +40,7 @@ function opening_hours(data, mensa, now){
@@ -157,7 +157,8 @@ function display_mensa(plan){
@@ -235,4 +236,4 @@ register_middle_content('<div id="mensa"></div>', function(){
\ No newline at end of file