Commit 6b05c09
committed
Merge branch 'ticket_1935' of https://github.com/bombycilla/alma into bombycilla-ticket_1935
Conflicts:
alma_user/alma_user.module1 file changed
+1
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
249 | 249 | | |
250 | 250 | | |
251 | 251 | | |
252 | | - | |
| 252 | + | |
253 | 253 | | |
0 commit comments