Milos Kozak
d40c5079d5
Merge pull request #147 from nightscout/2.8.0prep
...
2.8.0 release
2021-01-02 11:05:02 +01:00
Milos Kozak
a758d2f332
Merge pull request #168 from nightscout/dev
...
dev
2021-01-02 10:46:27 +01:00
Milos Kozak
12da224426
Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
2021-01-02 10:46:21 +01:00
Milos Kozak
6c97fe0460
test
2021-01-02 10:45:57 +01:00
Milos Kozak
e4c724fda1
New Crowdin updates ( #167 )
...
* New translations strings.xml (Dutch)
* New translations exam.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations exam.xml (Dutch)
* New translations strings.xml (French)
2021-01-02 10:25:38 +01:00
Milos Kozak
c46812f8c0
test debug
2021-01-02 10:25:21 +01:00
Milos Kozak
4c64e9b748
test debug
2021-01-01 23:52:44 +01:00
Milos Kozak
0a90e51313
Merge pull request #164 from nightscout/dev
...
Dev
2021-01-01 22:51:25 +01:00
Milos Kozak
a547d4c976
Merge pull request #163 from nightscout/l10n_dev
...
New Crowdin updates
2021-01-01 22:33:05 +01:00
Milos Kozak
1ce17c3dc2
New translations strings.xml (Polish)
2021-01-01 22:14:34 +01:00
Milos Kozak
9f4b622fc9
New translations strings.xml (Polish)
2021-01-01 21:14:17 +01:00
Milos Kozak
dac0cf4234
New translations objectives.xml (Polish)
2021-01-01 21:14:15 +01:00
Milos Kozak
903adc90c3
New translations exam.xml (Polish)
2021-01-01 21:14:13 +01:00
Milos Kozak
ccbb8eeb69
New translations strings.xml (Polish)
2021-01-01 21:14:11 +01:00
Milos Kozak
0427f602b5
New translations strings.xml (Polish)
2021-01-01 21:14:09 +01:00
Milos Kozak
0678f96394
New translations strings.xml (Dutch)
2021-01-01 21:14:06 +01:00
Milos Kozak
89fd5158ea
Merge pull request #162 from nightscout/dev
...
Dev
2021-01-01 20:40:20 +01:00
Milos Kozak
fd27f6ed98
New translations strings.xml (Polish) ( #161 )
2021-01-01 20:38:15 +01:00
Milos Kozak
418c63ecd8
New Crowdin updates ( #159 )
...
* New translations strings.xml (Italian)
* New translations exam.xml (Italian)
* New translations exam.xml (French)
* New translations exam.xml (Russian)
* New translations strings.xml (Italian)
* New translations exam.xml (Italian)
* New translations exam.xml (Italian)
* New translations strings.xml (Dutch)
* New translations exam.xml (Italian)
* New translations strings.xml (Italian)
* New translations exam.xml (Italian)
* New translations exam.xml (Polish)
* New translations strings.xml (Dutch)
* New translations exam.xml (Polish)
2021-01-01 19:23:03 +01:00
Milos Kozak
96420035dc
Merge pull request #160 from Philoul/LoopDialog_UpdateImprovement
...
Loop dialog refresh
2021-01-01 19:18:55 +01:00
Philoul
6f8faae8de
Improve Dialog Refresh
2021-01-01 16:44:25 +01:00
Milos Kozak
f4c2ceffc2
minSdkVersion 26 - Android 8
2021-01-01 11:43:27 +01:00
Milos Kozak
5bbefcbffa
Merge pull request #158 from nightscout/dev
...
Dev merge
2021-01-01 11:38:54 +01:00
Milos Kozak
6c53a44210
New Crowdin updates ( #155 )
...
* New translations objectives.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Slovak)
* New translations exam.xml (Bulgarian)
* New translations exam.xml (Slovak)
* New translations objectives.xml (Slovak)
* New translations strings.xml (Bulgarian)
* New translations objectives.xml (Bulgarian)
* New translations strings.xml (Dutch)
* New translations strings.xml (Norwegian)
* New translations objectives.xml (Norwegian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Italian)
* New translations exam.xml (Italian)
* New translations exam.xml (Italian)
* New translations exam.xml (Norwegian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations exam.xml (Italian)
* New translations objectives.xml (Italian)
* New translations strings.xml (Italian)
* New translations exam.xml (Norwegian)
* New translations strings.xml (Italian)
* New translations exam.xml (Italian)
* New translations exam.xml (Spanish)
* New translations strings.xml (Italian)
* New translations objectives.xml (Spanish)
* New translations exam.xml (Swedish)
2021-01-01 11:38:02 +01:00
Milos Kozak
21c92d41c8
fix passing context
2021-01-01 11:37:24 +01:00
Milos Kozak
5ae6191922
New Crowdin updates ( #151 )
...
* New translations exam.xml (French)
* New translations exam.xml (Czech)
* New translations exam.xml (German)
* New translations exam.xml (Hebrew)
* New translations exam.xml (Dutch)
* New translations exam.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations exam.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations exam.xml (Hebrew)
* New translations exam.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations exam.xml (Italian)
2020-12-30 10:38:35 +01:00
Milos Kozak
b314b443f9
Merge pull request #152 from Philoul/Fix_Wizard_Dialog
...
Fix New checkbox in Dialog wizard for low res
2020-12-30 10:34:32 +01:00
Milos Kozak
70e87d512c
Merge pull request #153 from jakobsandberg/crowdin-urls
...
Point contributing docs to crowdin urls
2020-12-30 10:33:40 +01:00
Milos Kozak
c2e500dfd8
Merge pull request #154 from swissalpine/patch-2
...
Change text size to see buttons on small screens
2020-12-30 10:33:07 +01:00
Philoul
d4d8a8962a
Improve vertical alignement
2020-12-30 09:41:12 +01:00
swissalpine
e5fa594068
Change text size to see buttons on small screens
...
Depending on the length of the explanatory text, not all buttons can be seen on small displays. Some alarms can only be muted by restarting the programme.
2020-12-30 08:51:56 +01:00
Jakob Sandberg
b0c02396d6
Point contributing docs to crowdin urls
2020-12-29 18:27:30 -08:00
Philoul
86410b786f
Fix Checkbox in dialog_wizard
2020-12-29 23:08:37 +01:00
Milos Kozak
1c8ed7b1a2
New Crowdin updates ( #148 )
...
* New translations objectives.xml (Swedish)
* New translations objectives.xml (French)
* New translations exam.xml (Czech)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations exam.xml (Czech)
* New translations objectives.xml (Swedish)
* New translations strings.xml (Romanian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (French)
* New translations strings.xml (Spanish)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Czech)
* New translations strings.xml (German)
* New translations strings.xml (Hebrew)
* New translations exam.xml (Czech)
* New translations exam.xml (Romanian)
* New translations exam.xml (Afrikaans)
* New translations objectives.xml (German)
* New translations exam.xml (Greek)
* New translations strings.xml (Romanian)
* New translations strings.xml (Greek)
* New translations strings.xml (Romanian)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (German)
* New translations strings.xml (Italian)
* New translations strings.xml (Spanish)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (Czech)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Greek)
* New translations strings.xml (Irish)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Turkish)
* New translations exam.xml (Polish)
* New translations strings.xml (Chinese Simplified)
* New translations exam.xml (Swedish)
* New translations exam.xml (Portuguese, Brazilian)
* New translations exam.xml (Russian)
* New translations exam.xml (Chinese Simplified)
* New translations strings.xml (Portuguese, Brazilian)
* New translations exam.xml (Slovak)
* New translations exam.xml (Portuguese)
* New translations exam.xml (Norwegian)
* New translations exam.xml (Dutch)
* New translations strings.xml (Swedish)
* New translations strings.xml (Slovak)
* New translations strings.xml (Portuguese)
* New translations exam.xml (Korean)
* New translations strings.xml (Swedish)
* New translations strings.xml (Slovak)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Polish)
* New translations strings.xml (Russian)
* New translations strings.xml (Portuguese)
* New translations objectives.xml (Dutch)
* New translations objectives.xml (Swedish)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Dutch)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Korean)
* New translations strings.xml (Korean)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Dutch)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Polish)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Russian)
* New translations strings.xml (Slovak)
* New translations strings.xml (Swedish)
* New translations strings.xml (Italian)
* New translations strings.xml (Swedish)
* New translations strings.xml (Polish)
* New translations exam.xml (Italian)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Polish)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Slovak)
* New translations strings.xml (Korean)
* New translations strings.xml (Russian)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Swedish)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Turkish)
* New translations strings.xml (French)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations exam.xml (French)
* New translations exam.xml (Dutch)
* New translations strings.xml (Romanian)
* New translations objectives.xml (Hebrew)
* New translations exam.xml (Dutch)
* New translations exam.xml (Romanian)
* New translations exam.xml (Lithuanian)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations exam.xml (Lithuanian)
* New translations exam.xml (Romanian)
* New translations exam.xml (French)
* New translations objectives.xml (Lithuanian)
* New translations exam.xml (Lithuanian)
* New translations exam.xml (French)
* New translations exam.xml (Lithuanian)
* New translations exam.xml (Dutch)
* New translations exam.xml (Portuguese, Brazilian)
* New translations exam.xml (Swedish)
* New translations exam.xml (Slovak)
* New translations exam.xml (Russian)
* New translations exam.xml (Portuguese)
* New translations exam.xml (Polish)
* New translations exam.xml (Norwegian)
* New translations exam.xml (Korean)
* New translations exam.xml (Italian)
* New translations exam.xml (Hebrew)
* New translations exam.xml (Greek)
* New translations exam.xml (German)
* New translations exam.xml (Czech)
* New translations exam.xml (Spanish)
* New translations exam.xml (French)
* New translations exam.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations exam.xml (Romanian)
* New translations objectives.xml (Romanian)
2020-12-29 21:44:36 +01:00
Milos Kozak
1229e53c3b
Merge pull request #149 from nightscout/adrian/overviewMenus-access
...
Adrian/overview menus access
2020-12-29 21:40:53 +01:00
Milos Kozak
815cbbd21d
Merge pull request #150 from CapnGrumpy/master
...
Update exam.xml
2020-12-29 18:36:53 +01:00
Milos Kozak
60b71668ea
Merge pull request #146 from p5nbTgip0r/mdt-insulin-change
...
Fix reservoir changes on MDT pumps being logged as cannula changes
2020-12-29 18:36:27 +01:00
Milos Kozak
a97b6149ca
code cleanup
2020-12-29 18:36:03 +01:00
Matthew Gray
40871717bc
Update exam.xml
...
Consistency in use of I:C and not using 'Topic'.
2020-12-29 13:39:56 +00:00
AdrianLxM
aedc2cb352
prepare graphs with settings size used for ui updates
2020-12-29 13:30:46 +01:00
AdrianLxM
d0b6e09250
reduce access to setting in OverviewMenus
2020-12-29 13:14:03 +01:00
Milos Kozak
8191cffd05
New Crowdin updates ( #110 )
...
* New translations strings.xml (Afrikaans)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Czech)
* New translations strings.xml (Czech)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (Greek)
* New translations strings.xml (Greek)
* New translations strings.xml (Croatian)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Czech)
* New translations strings.xml (Polish)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (German)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Spanish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Slovak)
* New translations strings.xml (Russian)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Dutch)
* New translations strings.xml (Italian)
* New translations strings.xml (Romanian)
* New translations strings.xml (French)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Lithuanian)
* New translations exam.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Dutch)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Russian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Russian)
* New translations strings.xml (French)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Czech)
* New translations strings.xml (Czech)
* New translations strings.xml (German)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations exam.xml (Italian)
* New translations objectives.xml (Italian)
* New translations strings.xml (Czech)
* New translations strings.xml (German)
* New translations strings.xml (Italian)
* New translations strings.xml (Czech)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Swedish)
* New translations strings.xml (Slovak)
* New translations strings.xml (Russian)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Polish)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Dutch)
* New translations strings.xml (Korean)
* New translations strings.xml (German)
* New translations strings.xml (Italian)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Greek)
* New translations strings.xml (German)
* New translations strings.xml (Czech)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (Spanish)
* New translations strings.xml (French)
* New translations strings.xml (Romanian)
* New translations strings.xml (Italian)
* New translations strings.xml (Czech)
* New translations strings.xml (Italian)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Slovenian)
* New translations strings.xml (Croatian)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Turkish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Slovak)
* New translations strings.xml (Russian)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Polish)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Dutch)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Korean)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Italian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Slovak)
* New translations strings.xml (Russian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Dutch)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Italian)
* New translations strings.xml (German)
* New translations strings.xml (Spanish)
* New translations strings.xml (French)
* New translations strings.xml (Polish)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Czech)
* New translations strings.xml (Swedish)
* New translations strings.xml (Irish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Greek)
* New translations strings.xml (German)
* New translations strings.xml (Czech)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (French)
* New translations strings.xml (Romanian)
* New translations strings.xml (Czech)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Czech)
* New translations strings.xml (Czech)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (German)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Russian)
* New translations strings.xml (Italian)
* New translations strings.xml (Russian)
* New translations strings.xml (Italian)
* New translations strings.xml (Russian)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (French)
* New translations strings.xml (German)
* New translations strings.xml (Czech)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Dutch)
* New translations strings.xml (Romanian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Italian)
* New translations strings.xml (Czech)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Polish)
* New translations strings.xml (French)
* New translations strings.xml (Spanish)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (German)
* New translations strings.xml (Greek)
* New translations strings.xml (Korean)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Dutch)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Russian)
* New translations strings.xml (Slovak)
* New translations strings.xml (Swedish)
* New translations strings.xml (Turkish)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Czech)
* New translations strings.xml (Czech)
* New translations exam.xml (Greek)
* New translations exam.xml (Polish)
* New translations exam.xml (Norwegian)
* New translations exam.xml (Dutch)
* New translations exam.xml (Korean)
* New translations exam.xml (Hebrew)
* New translations exam.xml (German)
* New translations exam.xml (Czech)
* New translations exam.xml (Spanish)
* New translations exam.xml (French)
* New translations exam.xml (Romanian)
* New translations exam.xml (Russian)
* New translations exam.xml (Portuguese)
* New translations exam.xml (Slovak)
* New translations objectives.xml (Hebrew)
* New translations objectives.xml (Greek)
* New translations objectives.xml (German)
* New translations objectives.xml (Czech)
* New translations objectives.xml (Bulgarian)
* New translations objectives.xml (Spanish)
* New translations objectives.xml (Lithuanian)
* New translations objectives.xml (French)
* New translations objectives.xml (Romanian)
* New translations exam.xml (Portuguese, Brazilian)
* New translations exam.xml (Swedish)
* New translations objectives.xml (Korean)
* New translations objectives.xml (Dutch)
* New translations objectives.xml (Portuguese, Brazilian)
* New translations objectives.xml (Norwegian)
* New translations objectives.xml (Swedish)
* New translations objectives.xml (Slovak)
* New translations objectives.xml (Russian)
* New translations objectives.xml (Portuguese)
* New translations objectives.xml (Polish)
* New translations objectives.xml (Italian)
* New translations exam.xml (Italian)
* New translations exam.xml (Lithuanian)
2020-12-29 11:40:58 +01:00
Milos Kozak
90cb482cc0
bump 2.8.0
2020-12-29 11:07:09 +01:00
Milos Kozak
d71f922b84
Merge pull request #115 from nightscout/objectives
...
Objective 3: Rewrite of questions to make them clearer.
2020-12-29 11:04:24 +01:00
p5nbTgip0r
549745017b
Fix reservoir changes on MDT pumps being logged as cannula changes
...
When the cannula tubing is primed on Medtronic pumps (manual prime), the history entry that gets logged is the same type as a fixed-prime (for priming the cannula after it has been inserted) so any time the reservoir was replaced AAPS would log a site change which reset autosens unnecessarily and also led to inaccurate reporting of insulin/cannula changes in Nightscout.
This commit aims to fix that by checking the `FixedAmount` data entry of `Prime` history entries to detect whether the prime was a manual-prime (priming tubing) or fixed-prime (priming cannula) and skip logging a site change event if it is the former. In order to automatically log insulin reservoir replacements, this commit also adds a monitor for `Rewind` history entries which logs an `InsulinChange` event for them (similar to the priming monitor).
2020-12-28 18:19:57 -08:00
Milos Kozak
f9ec47010e
fix test
2020-12-28 23:45:53 +01:00
Milos Kozak
6ed733f8cf
Objectives correction
2020-12-28 22:59:45 +01:00
Milos Kozak
52c6d762f5
Merge branch 'dev' into objectives
2020-12-28 18:40:10 +01:00
Milos Kozak
a8631866da
2.7.3-dev
2020-12-28 16:55:51 +01:00
Milos Kozak
e59fa702ec
Merge branch 'wizard' into dev
2020-12-28 16:42:43 +01:00
