Vladimír Čunát 5b0398dc36
Merge branch 'master' into staging-next
Conflicts: gobby and libinfinity - I took the hand-edited versions
instead of those resuting from the mass-replacement.

Hydra: ?compare=1473190
2018-08-13 20:43:59 +02:00
..
2018-03-21 18:06:28 +00:00
2018-03-21 18:06:28 +00:00
2017-10-18 23:21:37 +00:00
2018-03-21 18:06:28 +00:00
2018-03-21 18:06:28 +00:00
2018-03-21 18:06:28 +00:00
2018-05-15 20:55:53 +00:00