Merge remote-tracking branch 'origin/barwidget_Haraldr' into Deggendorf_App_1.0
# Conflicts: # lib/bin/main.dart # pubspec.yaml
No related branches found
No related tags found
Showing
- assets/degg.png 0 additions, 0 deletionsassets/degg.png
- assets/deggwappen.png 0 additions, 0 deletionsassets/deggwappen.png
- lib/bin/main.dart 1 addition, 1 deletionlib/bin/main.dart
- lib/bottom_navigation_bar_buttons/event/barwidget.dart 42 additions, 0 deletionslib/bottom_navigation_bar_buttons/event/barwidget.dart
- lib/bottom_navigation_bar_buttons/event/imageslides.dart 70 additions, 0 deletionslib/bottom_navigation_bar_buttons/event/imageslides.dart
- lib/bottom_navigation_bar_buttons/event/infobox_text.dart 72 additions, 0 deletionslib/bottom_navigation_bar_buttons/event/infobox_text.dart
- pubspec.lock 7 additions, 0 deletionspubspec.lock
- pubspec.yaml 1 addition, 2 deletionspubspec.yaml
assets/degg.png
0 → 100644
158 KiB
assets/deggwappen.png
0 → 100644
38.6 KiB