Commit 87d5fae
committed
Merge branch 'feat/dates_page' into chore/uimessage_refactoring
# Conflicts:
# core/src/main/java/org/openedx/core/presentation/dates/DatesUI.kt
# dates/src/main/java/org/openedx/dates/presentation/dates/DatesViewModel.kt
# dates/src/test/java/org/openedx/dates/DatesViewModelTest.ktFile tree
3 files changed
+8
-1
lines changed- core/src/main/java/org/openedx/core/presentation/dates
- dates/src
- main/java/org/openedx/dates/presentation/dates
- test/java/org/openedx/dates
3 files changed
+8
-1
lines changedLines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
263 | 263 | | |
264 | 264 | | |
265 | 265 | | |
266 | | - | |
| 266 | + | |
267 | 267 | | |
268 | 268 | | |
269 | 269 | | |
| |||
Lines changed: 6 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| 6 | + | |
6 | 7 | | |
| 8 | + | |
7 | 9 | | |
| 10 | + | |
8 | 11 | | |
9 | 12 | | |
10 | 13 | | |
| 14 | + | |
11 | 15 | | |
12 | 16 | | |
13 | 17 | | |
| |||
22 | 26 | | |
23 | 27 | | |
24 | 28 | | |
| 29 | + | |
25 | 30 | | |
| 31 | + | |
26 | 32 | | |
27 | 33 | | |
28 | 34 | | |
| |||
Lines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| 28 | + | |
28 | 29 | | |
29 | 30 | | |
30 | 31 | | |
| |||
0 commit comments