1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-18 02:46:28 +00:00
Commit graph

1823 commits

Author SHA1 Message Date
Jan Tojnar c06774d0f1
gnome3.gnome-photos: 3.28.0 → 3.30.1 2018-11-30 21:34:21 +01:00
Jan Tojnar b69722b0c1
gnome3.gnome-packagekit: 3.28.0 → 3.30.0 2018-11-30 21:34:21 +01:00
Jan Tojnar 4e4202acdb
gnome3.gnome-online-miners: 3.26.0 → 3.30.0 2018-11-30 21:34:20 +01:00
Jan Tojnar 1544e140d6
gnome3.gnome-online-accounts: 3.28.0 → 3.30.0 2018-11-30 21:34:20 +01:00
Jan Tojnar 00eaa166fc
gnome3.gnome-music: 3.28.2.1 → 3.30.2 2018-11-30 21:34:20 +01:00
Jan Tojnar 239364679e
gnome3.gnome-mines: 3.28.0 → 3.30.1.1 2018-11-30 21:34:19 +01:00
Jan Tojnar 48a7318d5a
gnome3.gnome-maps: 3.28.2 → 3.30.2.1 2018-11-30 21:34:19 +01:00
Jan Tojnar 2757eb7d40
gnome3.gnome-logs: 3.28.5 → 3.30.0 2018-11-30 21:34:19 +01:00
Jan Tojnar 267e564b27
gnome3.gnome-documents: 3.28.2 → 3.30.0 2018-11-30 21:34:18 +01:00
Jan Tojnar 17d52ba84e
gnome3.gnome-disk-utility: 3.28.3 → 3.30.2 2018-11-30 21:34:18 +01:00
Jan Tojnar a5920916e1
gnome3.gnome-desktop: 3.28.2 → 3.30.2 2018-11-30 21:34:18 +01:00
Jan Tojnar f5342946c3
gnome3.gnome-control-center: 3.28.2 → 3.30.2 2018-11-30 21:34:17 +01:00
Jan Tojnar 21f0b27e4f
gnome3.gnome-contacts: 3.28.2 → 3.30.1 2018-11-30 21:34:17 +01:00
Jan Tojnar d15332a392
gnome3.gnome-color-manager: 3.28.0 → 3.30.0 2018-11-30 21:34:17 +01:00
Jan Tojnar 25ece79161
gnome3.gnome-clocks: 3.28.0 → 3.30.1 2018-11-30 21:34:17 +01:00
Jan Tojnar 3d3ab77fae
gnome3.gnome-chess: 3.28.1 → 3.30.0 2018-11-30 21:34:16 +01:00
Jan Tojnar 1d00c5b935
gnome3.gnome-characters: 3.28.2 → 3.30.0 2018-11-30 21:34:16 +01:00
Jan Tojnar 3254228ca0
gnome3.gnome-calendar: 3.28.2 → 3.30.1 2018-11-30 21:34:16 +01:00
Jan Tojnar 3493889bbb
gnome3.gnome-calculator: 3.28.2 → 3.30.1 2018-11-30 21:34:15 +01:00
Jan Tojnar 83ce748807
gnome3.gnome-boxes: 3.28.5 → 3.30.3 2018-11-30 21:34:00 +01:00
Jan Tojnar 4dda564576
gnome3.gnome-backgrounds: 3.28.0 → 3.30.0 2018-11-30 21:33:59 +01:00
Jan Tojnar 3a154cbbc3
gnome3.gjs: 1.52.3 → 1.54.3 2018-11-30 21:33:58 +01:00
Jan Tojnar 84f1759182
gnome3.gedit: 3.28.1 → 3.30.2 2018-11-30 21:33:57 +01:00
Jan Tojnar 5d6e2395ca
gnome3.gdm: 3.28.3 → 3.30.2 2018-11-30 21:33:57 +01:00
Jan Tojnar f6c9a6729e
gnome3.five-or-more: 3.28.0 → 3.30.0 2018-11-30 21:33:56 +01:00
Jan Tojnar 813c96b7c5
gnome3.file-roller: 3.28.1 → 3.30.1 2018-11-30 21:33:56 +01:00
Jan Tojnar 36f9685aee
evolution-data-server: 3.28.5 → 3.30.2 2018-11-30 21:33:56 +01:00
Jan Tojnar 40f9556c94
gnome3.evolution: 3.28.5 → 3.30.2 2018-11-30 21:33:55 +01:00
Jan Tojnar 45f7595575
evince: 3.28.2 → 3.30.2 2018-11-30 21:33:55 +01:00
Jan Tojnar 013df809d5
epiphany: 3.28.3.1 → 3.30.2 2018-11-30 21:33:55 +01:00
Jan Tojnar d6bb24df9f
gnome3.dconf-editor: 3.28.0 → 3.30.2 2018-11-30 21:33:54 +01:00
Jan Tojnar 54c3d87de1
gnome3.dconf: 0.28.0 → 0.30.1 2018-11-30 21:33:54 +01:00
Jan Tojnar eb6347bc05
gnome3.cheese: 3.28.0 → 3.30.0 2018-11-30 21:33:54 +01:00
Jan Tojnar cb842f8533
gnome3.gnome-notes: 3.28.3 → 3.30.3 2018-11-30 21:33:53 +01:00
Jan Tojnar e29980b372
baobab: 3.28.0 → 3.30.0 2018-11-30 21:33:53 +01:00
Jan Tojnar e447800e5f
gnome3.aisleriot: 3.22.5 → 3.22.7 2018-11-30 21:33:53 +01:00
Jan Tojnar 7ba6b65c43
gnome3.adwaita-icon-theme: 3.28.0 → 3.30.1 2018-11-30 21:33:52 +01:00
Frederik Rietdijk 9b81c7e455 Merge staging-next into staging 2018-11-29 09:18:35 +01:00
Frederik Rietdijk 9db2421d1f Merge master into staging-next 2018-11-29 08:12:56 +01:00
Peter Simons 00a8fdac61 gnome3.gnome-keyring: disable test suite on i686 to fix the build
https://github.com/NixOS/nixpkgs/issues/51121
(cherry picked from commit 86d1ba34b4)
2018-11-27 17:43:45 +01:00
Matthew Bauer d492f53faf
Merge pull request #50527 from matthewbauer/ninja-check-phase
Add check phase to ninja setup hook
2018-11-20 16:55:12 -06:00
Matthew Bauer 2c47a4229f treewide: remove ctest usages
These are already in the generated makefiles!
2018-11-18 19:31:02 -06:00
Jan Tojnar 85bd2a7acb
Merge pull request #46020 from jtojnar/meson-0.47
meson: 0.46.1 → 0.48.2
2018-11-18 22:17:49 +01:00
Jan Tojnar 63ab92cff8
gnome3.gnome-session: add python3 for install script
Meson no longer propagates it so we need to re-add it.
2018-11-13 14:39:43 +01:00
Jan Tojnar 5c5736e6e2
gnome3.gnome-bluetooth: add python3 for install script
Meson no longer propagates it so we need to re-add it.
2018-11-13 14:39:42 +01:00
Jan Tojnar 08db7cf19b
gnome3.gnome-settings-daemon: add python3 for install script
Meson no longer propagates it so we need to re-add it.
2018-11-13 14:39:42 +01:00
Matthew Bauer a83dc7e331
Merge pull request #47690 from romildo/fix.icon-cache
build GTK icon caches for some packages
2018-11-12 17:24:53 -06:00
José Romildo Malaquias 83efc39766 gnome-themes-extra: build GTK icon cache 2018-11-12 21:05:25 -02:00
Jan Tojnar 033dce35d8
Merge pull request #48047 from thefloweringash/fix-mutter-crash
gnome3.mutter: fix crash on startup with nvidia drivers
2018-11-04 13:47:16 +01:00
Tristan Helmich (omniIT) eaa4b7e0bd adwaita-icon-theme: 3.28.0 -> 3.30.0 2018-10-28 21:58:58 +01:00
Andreas Rammhold 6ad3088b12 libgxps: fix CVE-2018-10733 2018-10-26 12:17:58 +02:00
Jan Tojnar 6b8657e159 gnome3.dconf-editor: clean up 2018-10-21 21:46:14 +02:00
Jan Tojnar 34ca5f34e2 gnome3.gnome-packagekit: clean up 2018-10-21 21:46:13 +02:00
Jan Tojnar 467c459b9e gnome3.nautilus: add glib-networking
Necessary for WebDAV over TLS, etc.
2018-10-21 20:55:33 +02:00
Tor Hedin Brønner f908bf2730 gnome3.gdm: Always reset the environment for new sessions
When GDM launches a new session it will inherit the user's systemd
environment (but only unset variables). If `__NIXOS_SET_ENVIRONMENT_DONE` is set
in the user's systemd environment it will prevent the environment to be set
properly or updated (eg. after having done a system rebuild).

Gnome sessions exports their environment to systemd at startup. If something
is keeping the user's systemd process alive (eg. ssh) launching a new gnome
session after logging out will result in a broken PATH. Specifically the PATH
will be inherited from GDM and never reset.

We patch GDM to never inherit `__NIXOS_SET_ENVIRONMENT_DONE` so new sessions
will always reset their base environment.

fixes https://github.com/NixOS/nixpkgs/issues/48255

For more info about the environment setup:
https://github.com/NixOS/nixpkgs/pull/45784
2018-10-16 07:09:46 +02:00
Andrew Childs 6a5a5b9fa0 gnome3.gnome-contacts: fix compile failure due to clutter-gtk change (#48135) 2018-10-10 22:46:29 +02:00
Andrew Childs e2e23ddd89 gnome3.mutter: fix crash on startup with nvidia drivers 2018-10-08 22:23:42 +09:00
Jan Tojnar 5cc18c4781
gnome3: remove versionBranch attribute
Standard library now contains stdenv.lib.versions.majorMinor,
which does the same.
2018-10-05 02:17:19 +02:00
Jan Tojnar 9db0207496
gnome3: remove version attribute
It was used by some themes in the past, but it broke them whenever GNOME
was updated, so it should not be used anymore.
2018-10-05 02:07:09 +02:00
Matthew Bauer 1ffe83caa7
Merge pull request #42846 from ambrop72/optimus-prime-config-master
nixos/xserver: Implement configuration of NVIDIA Optimus via PRIME
2018-10-03 22:56:53 -05:00
Tor Hedin Brønner 1d6639c575 gnome3.gnome-session: update glib reference
gsettings now reside in glib's `bin` output.
2018-10-03 21:19:08 +02:00
Frederik Rietdijk de419917a3 Merge master into staging-next 2018-09-18 18:44:48 +02:00
Tor Hedin Brønner c32b0409a9
pipewire: 0.1.9 -> 0.2.3
I also removed pipewire from mutter temporarily, since it is not compatible.
2018-09-14 05:09:00 +02:00
Uli Baum 1df2560dde Merge branch 'master' into staging-next 2018-09-13 10:08:53 +02:00
Jan Tojnar feb18af060
gnome3.rygel: init at 0.36.2 2018-09-08 06:57:14 +02:00
Tor Hedin Brønner cf0342a261 gnome3.tracker: 2.1.3 -> 2.1.4 (#46086)
Fix build with format-security flag
2018-09-05 10:42:48 +02:00
Vladimír Čunát 1428d00aa4
Merge branch 'master' into staging-next
Hydra: ?compare=1477053
2018-09-04 13:06:45 +02:00
Jan Tojnar d7c0d9a7f8
gnome3.file-roller: add python3 for install script
Meson no longer propagates it so we need to re-add it.
2018-09-04 03:23:45 +02:00
Jan Tojnar 5f33edda40
gnome3.gnome-boxes: add python3 for install script
Meson no longer propagates it so we need to re-add it.
2018-09-04 03:23:44 +02:00
Jan Tojnar b3e4a1a64c
gnome3.gnome-tweaks: add python3 for install script
Meson no longer propagates it so we need to re-add it.
2018-09-04 03:23:44 +02:00
Jan Tojnar 4b50a184f3
gnome3.simple-scan: add python3 for install script
Meson no longer propagates it so we need to re-add it.
2018-09-04 03:23:43 +02:00
Jan Tojnar 1d1af9cc4d
gnome3.nautilus: add python3 for install script
Meson no longer propagates it so we need to re-add it.
2018-09-04 03:23:43 +02:00
Jan Tojnar cc4c51df93
gnome3.epiphany: add python3 for install script
Meson no longer propagates it so we need to re-add it.
2018-09-04 03:23:43 +02:00
Jan Tojnar b39e9834cb
gnome3.gnome-screenshot: add python3 for install script
Meson no longer propagates it so we need to re-add it.
2018-09-04 03:23:42 +02:00
Jan Tojnar 2431f9101c
gnome3.gnome-mines: add python3 for install script
Meson no longer propagates it so we need to re-add it.
2018-09-04 03:23:42 +02:00
Jan Tojnar 18f3e11880
gnome3.atomix: add python3 for install script
Meson no longer propagates it so we need to re-add it.
2018-09-04 03:23:37 +02:00
Jan Tojnar 9ab012d0f1
gnome3.swell-foop: add python3 for install script
Meson no longer propagates it so we need to re-add it.
2018-09-04 03:23:37 +02:00
Jan Tojnar b8a7e2a116
gnome3.gnome-control-center: add python3 for install script
Meson no longer propagates it so we need to re-add it.
2018-09-04 03:23:37 +02:00
Jan Tojnar 88759d117d
gnome3.gnome-chess: add python3 for install script
Meson no longer propagates it so we need to re-add it.
2018-09-04 03:23:36 +02:00
Jan Tojnar 1914e51249
gnome3.gnome-contacts: add python3 for install script
Meson no longer propagates it so we need to re-add it.
2018-09-04 03:23:36 +02:00
Jan Tojnar 3d899d0ddd
gnome3.gnome-disk-utility: add python3 for install script
Meson no longer propagates it so we need to re-add it.
2018-09-04 03:23:36 +02:00
Jan Tojnar 3e3972a054
gnome3.gnome-todo: add python3 for install script
Meson no longer propagates it so we need to re-add it.
2018-09-04 03:23:35 +02:00
Jan Tojnar 091ed8f2f8
gnome3.eog: add python3 for install script
Meson no longer propagates it so we need to re-add it.
2018-09-04 03:23:35 +02:00
Jan Tojnar dd8d38fcf0
gnome3.bijiben: add python3 for install script
Meson no longer propagates it so we need to re-add it.
2018-09-04 03:23:35 +02:00
Jan Tojnar af47286621
gnome3.gnome-characters: add python3 for install script
Meson no longer propagates it so we need to re-add it.
2018-09-04 03:23:34 +02:00
Jan Tojnar d99291efab
gnome3.gnome-documents: add python3 for install script
Meson no longer propagates it so we need to re-add it.
2018-09-04 03:23:34 +02:00
Jan Tojnar 0c4e69dd78
gnome3.gnome-calendar: add python3 for install script
Meson no longer propagates it so we need to re-add it.
2018-09-04 03:23:34 +02:00
Jan Tojnar 5043df2499
gnome3.devhelp: add python3 for install script
Meson no longer propagates it so we need to re-add it.
2018-09-04 03:23:33 +02:00
Jan Tojnar 69fa70ad46
gnomeExtensions.mediaplayer: add python3 for install script
Meson no longer propagates it so we need to re-add it.
2018-09-04 03:23:33 +02:00
Jan Tojnar bf38aea59b
gnome3.gnome-calculator: add python3 for install script
Meson no longer propagates it so we need to re-add it.
2018-09-04 03:23:33 +02:00
Jan Tojnar 804a26e6b7
gnome3.dconf-editor: add python3 for install script
Meson no longer propagates it so we need to re-add it.
2018-09-04 03:23:32 +02:00
Jan Tojnar 9c4323b5de
gnome3.gnome-power-manager: add python3 for install script
Meson no longer propagates it so we need to re-add it.
2018-09-04 03:23:32 +02:00
Jan Tojnar a502b155f0
gnome3.libgweather: add python3 for install script
Meson no longer propagates it so we need to re-add it.
2018-09-04 03:23:31 +02:00
Jan Tojnar 767803b3d2
gnome3.tracker: 2.1.2 → 2.1.3 2018-09-04 03:23:31 +02:00
Frederik Rietdijk b910b697f6 Merge master into staging 2018-09-02 12:10:33 +02:00
Jan Tojnar 92a5bb680c
gnome3.tracker-miners: 2.1.1 → 2.1.3 2018-09-01 23:03:03 +02:00
Jan Tojnar 39db436709
gnome3.gnome-font-viewer: 3.28.0 → 3.30.0 2018-09-01 22:41:50 +02:00
Jan Tojnar 810111616b
gnome3.geary: 0.12.3 → 0.12.4 2018-09-01 20:58:44 +02:00
Vladimír Čunát 2d6179d1e8
Merge branch 'master' into staging
A few trivial conflicts due to *Platforms mass replace.
2018-09-01 17:38:18 +02:00
Robert Schütz a9780a095b Merge branch 'master' into staging-next 2018-08-30 21:56:13 +02:00
Vladimír Čunát 80b25db15c
treewide: use glib tools from build-time $PATH
Using explicit output feels more flaky in case we e.g. move the binary.
(No strong opinion on my side, feel free to revert if you think so.)
2018-08-30 19:47:41 +02:00
Vladimír Čunát 8fc6472ace
gnome-documents, tlaplus: fix glib references 2018-08-30 19:47:41 +02:00
Jan Tojnar 6cefc9c1b0
Revert "treewide: remove placeholder usage"
This reverts commit 025881c236.
2018-08-30 18:18:30 +02:00
Jan Tojnar 69a17c7a19
Revert "treewide: remove placeholder usage"
This reverts commit 82f6267023.
2018-08-30 18:18:29 +02:00
Vladimír Čunát 19c68fe28c
Merge branch 'master' into staging 2018-08-30 12:25:43 +02:00
Vladimír Čunát 91b01208a0
gnome3.gnome-shell: fix build (missing xsltproc) 2018-08-30 09:56:16 +02:00
Frederik Rietdijk 6038628ea5 Merge master into staging-next 2018-08-29 20:54:55 +02:00
Jörg Thalheim 3a56156866 vala_0_32: remove 2018-08-29 11:39:28 +01:00
Frederik Rietdijk b61b993b75 Merge master into staging 2018-08-26 12:10:05 +02:00
Jan Tojnar c429c9a8bb
Merge pull request #45571 from jtojnar/gconf-to-error
gnome3.gconf: re-add as a pointer to the removal PR
2018-08-26 01:20:36 +02:00
Jan Tojnar 9364a931e9
gnome3.quadrapassel: clean up 2018-08-26 01:18:31 +02:00
Jan Tojnar 6e2c115235
gnome3.gnome-desktop: use substituteAll for patch 2018-08-25 21:41:14 +02:00
Jan Tojnar 1bd430e3d4
gnome3.gnome-keyring: clean up 2018-08-25 21:41:13 +02:00
Jan Tojnar 9f0eb759a4
gnome3.gconf: re-add as a pointer to the removal PR
https://github.com/NixOS/nixpkgs/pull/43268 removed GConf from GNOME 3
package set, let’s add an error for a little while to save people
digging through the commit log.
2018-08-25 20:41:34 +02:00
Jan Tojnar 5e3c1c2e32
gnome3.gnome-documents: 3.28.1 → 3.28.2 2018-08-25 15:57:25 +02:00
Jan Tojnar f3f6854033
gnome3.gnome-nibbles: 3.24.0 → 3.24.1 2018-08-25 15:57:24 +02:00
Jan Tojnar d6a6f9eb95
gnome3.caribou: fix on GNOME Flashback 2018-08-25 15:57:24 +02:00
Jan Tojnar 40535ced63
gnome3.vinagre: clean up 2018-08-25 15:57:24 +02:00
Jan Tojnar 05992b9b1b
gtk-vnc: rename from gtkvnc
Upstream uses gtk-vnc, let’s be consistent.
2018-08-25 15:57:23 +02:00
Jan Tojnar 21e9b85928
gnome3.tracker-miners: 2.0.5 → 2.1.1 2018-08-25 15:57:23 +02:00
Jan Tojnar c219d313dd
gnome3.tracker: 2.0.4 → 2.1.2 2018-08-25 15:57:23 +02:00
Jan Tojnar ede0b56cae
gnome3.libgnome-games-support: 1.4.1 → 1.4.2 2018-08-25 15:57:22 +02:00
Jan Tojnar 9c066735d5
gnome3.gnome-bluetooth: 3.28.1 → 3.28.2 2018-08-25 15:57:22 +02:00
Vladimír Čunát 2c1e736ae8
gnome3.libgda: build with gcc6 on aarch64
Fixes #45618.  I don't know what's the matter.
Feel free to come with a better fix.
2018-08-25 10:49:18 +02:00
Vladimír Čunát 153a19df05
Merge branch 'master' into staging-next
Hydra: ?compare=1474536
2018-08-20 09:15:33 +02:00
Vladimír Čunát 14aa936ec5
Merge branch 'staging-next' into staging 2018-08-17 20:53:27 +02:00
Vladimír Čunát 209730208a
Merge branch 'staging-next' 2018-08-17 20:51:31 +02:00
Vladimír Čunát cbabebcc2e
Merge branch 'master' into staging-next
Hydra: ?compare=1473892
2018-08-17 13:45:21 +02:00
Andreas Rammhold a4ded94f95
gnome3.gdm: 2.28.2 -> 2.28.3
Changes:
  - CVE-2018-14424 - double free fix
  - lifecycle fixes to libgdm/GdmClient
  - follow up fixes dealing with login screen reaping form last release
  - allow pam modules to use SIGUSR1
  - set PWD for user session
  - tell cirrus not to use wayland
  - Translation updates
2018-08-17 09:22:27 +02:00
Jan Tojnar 2f801195fc
gnome3.libgnome-games-support: propagate required dependencies 2018-08-14 22:02:20 +02:00
Jan Tojnar 5d62b6698a
gnome3.atomix: init at 3.29.3 2018-08-14 22:02:20 +02:00
Vladimír Čunát ded9a4b1aa
Merge branch 'staging-next' into staging
Commits from master, conflict resolutions, etc.
2018-08-13 20:57:50 +02:00
Vladimír Čunát 00df25ee57
Merge branch 'master' into staging-next
Hydra: ?compare=1472947
2018-08-12 10:33:41 +02:00
Jan Malakhovski 99974ea930 gnome3.gcr: make tests run, but disable 2018-08-11 09:35:34 +00:00
Jan Malakhovski 411ef0e0f9 gnome3.gnome-keyring: use checkInputs 2018-08-11 09:35:23 +00:00
Jan Tojnar 59186af889
Merge pull request #44803 from cdepillabout/add-correct-propagatedbuildinput-to-vte
add gtk3 as propagatedBuildInput to vte
2018-08-09 18:56:33 +02:00
Frederik Rietdijk d9fa74ba78 Merge master into staging 2018-08-09 18:28:15 +02:00
Jan Tojnar e4929b7c1a
gnome3: fix networkmanager gnome usage 2018-08-09 18:17:41 +02:00
Jan Tojnar aab242e1c5
gnome3.gucharmap: clean up
Clean up package, split into multiple outputs, enable devdoc.
2018-08-09 17:36:46 +02:00
Jan Tojnar c3ce3714ac
gnome3.gnome-applets: init at 3.28.0 2018-08-09 17:36:45 +02:00
Jan Tojnar ea286b0610
gnome3.gnome-flashback: init at 3.28.0 2018-08-09 17:36:44 +02:00
Jan Tojnar 64b5e0773b
gnome3.gnome-panel: init at 3.28.0 2018-08-09 17:36:43 +02:00
Jan Tojnar 46dcfd27c3
gnome3.metacity: init at 3.28.0 2018-08-09 17:36:43 +02:00
Jan Tojnar f48108e52a
gnome3.gnome-desktop: clean up 2018-08-09 17:36:43 +02:00
Jan Tojnar 0c9273509a
gnome3.gnome-terminal: clean up 2018-08-09 17:36:43 +02:00
(cdep)illabout 05c0c3f05c
vte: Change comment to talk about vte-2.91.pc file instead of .gir file. 2018-08-09 23:21:50 +09:00
(cdep)illabout 8edc67c468
vte: Add gtk3 as propagatedBuildInput
The `Vte.2.91.gir` imports `Gtk.3.0.gir`.  So in order to use
`Vte.2.91.gir`, you must also have `Gtk.3.0.gir` on the GI_TYPELIB_PATH.
Adding gtk3 to the `propagatedBuildInputs` of vte accomplishes this.
2018-08-09 11:58:17 +09:00
Jan Tojnar 83a18e14d9
Merge pull request #39792 from Moredread/fwupd
WIP fwupd: 1.0.5 -> 1.1.0
2018-08-08 11:57:39 +02:00
Jan Tojnar 82bf0a2cd2
gnome3.gnome-software: enable fwupd 2018-08-07 23:25:22 +02:00
Tuomas Tynkkynen 008fd5fcf5 Merge remote-tracking branch 'upstream/master' into staging 2018-08-04 15:17:42 +03:00