Commit 6e3bdfb
committed
Merge branch 'development' of https://github.com/AndreasEngelmark/os2loop into development
# Conflicts:
# composer.lockFile tree
310 files changed
+8446
-7893
lines changed- config/sync
- language/da
- web/profiles/custom/os2loop
- modules
- os2loop_documents/src/Controller
- os2loop_media
- modules/os2loop_media_fixtures
- src/Fixture
- src/Plugin/Field/FieldFormatter
- os2loop_oembed/src/TwigExtension
- os2loop_revision_date/src/Plugin/Action
- os2loop_upvote
- src
- EventSubscriber
- Helper
- themes/os2loop_theme
- assets/color-templates
- templates/content
- translations
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
310 files changed
+8446
-7893
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
78 | 78 | | |
79 | 79 | | |
80 | 80 | | |
81 | | - | |
82 | | - | |
83 | | - | |
84 | | - | |
85 | | - | |
86 | | - | |
87 | | - | |
88 | | - | |
89 | | - | |
90 | | - | |
91 | | - | |
92 | | - | |
93 | | - | |
94 | | - | |
95 | 81 | | |
96 | 82 | | |
97 | 83 | | |
| |||
100 | 86 | | |
101 | 87 | | |
102 | 88 | | |
103 | | - | |
| 89 | + | |
104 | 90 | | |
105 | | - | |
| 91 | + | |
106 | 92 | | |
107 | | - | |
| 93 | + | |
108 | 94 | | |
109 | | - | |
| 95 | + | |
110 | 96 | | |
111 | | - | |
| 97 | + | |
112 | 98 | | |
113 | 99 | | |
114 | 100 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
75 | 75 | | |
76 | 76 | | |
77 | 77 | | |
| 78 | + | |
78 | 79 | | |
79 | 80 | | |
80 | 81 | | |
| |||
124 | 125 | | |
125 | 126 | | |
126 | 127 | | |
127 | | - | |
128 | 128 | | |
129 | | - | |
130 | | - | |
| 129 | + | |
131 | 130 | | |
132 | | - | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
133 | 134 | | |
134 | 135 | | |
135 | 136 | | |
| |||
0 commit comments