Commit Graph

1128 Commits

Author SHA1 Message Date
Tobias Geerinckx-Rice 476af71353
gnu: Fix ‘Open GL’ typo.
* gnu/packages/gnome.scm (clutter, clutter-gtk, clutter-gst)
[synopsis, description]: Say ‘OpenGL’.
2019-02-21 17:26:47 +01:00
Tobias Geerinckx-Rice f010f89b13
gnu: clutter-gst: Don't use NAME in source URI.
* gnu/packages/gnome.scm (clutter-gst)[source]: Hard-code NAME.
2019-02-21 17:26:47 +01:00
Tobias Geerinckx-Rice ba07ac19f2
gnu: clutter-gst: Update to 3.0.27.
* gnu/packages/gnome.scm (clutter-gst): Update to 3.0.27.
2019-02-21 17:26:47 +01:00
Tobias Geerinckx-Rice 687b4909c9
gnu: libdazzle: Don't use NAME in source URI.
* gnu/packages/gnome.scm (libdazzle)[source]: Hard-code NAME.
2019-02-19 09:54:37 +01:00
Tobias Geerinckx-Rice 2fbab84878
gnu: ghex: Don't use NAME in source URI.
* gnu/packages/gnome.scm (ghex)[source]: Hard-code NAME.
2019-02-19 09:54:37 +01:00
Tobias Geerinckx-Rice 89f2d7360b
gnu: workrave: Compute source COMMIT from VERSION.
* gnu/packages/gnome.scm (workrave)[version, source]: Conventionally
generate COMMIT from VERSION, instead of the other way 'round.
2019-02-19 09:54:37 +01:00
Tobias Geerinckx-Rice fa75a21363
gnu: soundconverter: Update to 3.0.1.
* gnu/packages/gnome.scm (soundconverter): Update to 3.0.1.
[arguments]: Remove ‘fix-POTFILES.in’ phase.
* gnu/packages/patches/soundconverter-remove-gconf-dependency.patch:
Update.
2019-02-19 09:54:37 +01:00
Marius Bakke 61506fe551
gnu: Remove unneeded uses of python{,2}-minimal.
The "python-minimal" package exists mostly to resolve a dependency cycle.  To
reduce duplication, packages should prefer the regular Python variants.

* gnu/packages/admin.scm (htop)[native-inputs]: Change PYTHON-MINIMAL-WRAPPER
to PYTHON-WRAPPER.
* gnu/packages/crypto.scm (botan)[native-inputs]: Likewise.
* gnu/packages/bioinformatics.scm (sambamba)[native-inputs]: Change
PYTHON-MINIMAL to PYTHON.
* gnu/packages/dictionaries.scm (apertium)[native-inputs]: Likewise.
* gnu/packages/databases.scm (mongodb)[native-inputs]: Change PYTHON2-MINIMAL
to PYTHON2.
* gnu/packages/games.scm (openttd-opensfx, openttd-openmsx)[native-inputs]:
Likewise.
* gnu/packages/gnome.scm (deja-dup)[native-inputs]: Likewise.
2019-02-17 18:44:18 +01:00
Timothy Sample 41fa9f1815
services: gdm: Allow for custom X session scripts.
* gnu/packages/gnome.scm (gdm)[arguments]: Update pre-configure phase so
that GDM runs an X session script specified by the variable
GDM_X_SESSION; remove the '--enable-gdm-xsession' configuration
option.
* gnu/services/xorg.scm (<gdm-configuration>): Add 'x-session' field.
(gdm-shepherd-service): Set the GDM_X_SESSION variable.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2019-02-17 00:04:57 +01:00
Timothy Sample 1f564c1573
gnu: gdm: Run dbus-daemon via a wrapper script.
* gnu/packages/gnome.scm (gdm)[arguments]: Modify the pre-configure
phase so that GDM propagates the GDM_DBUS_DAEMON variable into the
session environment and uses its value to invoke dbus-daemon.
* gnu/services/xorg.scm (dbus-daemon-wrapper): New variable.
(<gdm-configuration>): Add 'dbus-daemon' field.
(gdm-shepherd-service): Set GDM_DBUS_DAEMON before invoking gdm.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2019-02-17 00:04:57 +01:00
Timothy Sample c9ff92b550
gnu: gdm: Simplify pre-configure phase.
* gnu/packages/gnome.scm (gdm)[arguments]: Simplify the pre-configure phase.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2019-02-17 00:04:57 +01:00
Timothy Sample def6d6b616
gnu: gdm: Use absolute path for gnome-session.
* gnu/packages/gnome.scm (gdm)[arguments]: Modify the pre-configure
phase to substitute in the absolute path of gnome-session.
[inputs]: Add gnome-session.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2019-02-17 00:04:57 +01:00
Timothy Sample 69544798ea
gnu: gdm: Add links to required login-session files.
* gnu/packages/gnome.scm (gdm)[arguments]: Add a phase that creates
symbolic links to required files from gnome-settings-daemon; do not set
XDG_CONFIG_DIRS in the session environment.
[inputs]: Add gnome-settings-daemon.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2019-02-17 00:04:56 +01:00
Timothy Sample 1d7bff4b4b
gnu: gnome-session: Use absolute paths in .desktop files.
This makes the gnome-session .desktop files usable even if gnome-session
is not available from the PATH variable.

* gnu/packages/gnome.scm (gnome-session)[arguments]: Add a phase that
adds the absolute path of gnome-session in its .desktop files.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2019-02-17 00:04:56 +01:00
Timothy Sample e57c2adb2a
services: gdm: Remove etc service.
* gnu/packages/gnome.scm (gdm)[arguments]: Update pre-configure phase to
make GDM get the configuration file path from an environment variable.
* gnu/services/xorg.scm (gdm-etc-service): Remove function.
(gdm-configuration-file): New function.
(gdm-shepherd-service): Set GDM_CUSTOM_CONF before invoking GDM.
(gdm-service-type)[extensions]: Remove etc-service-type extension.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2019-02-17 00:04:56 +01:00
Christopher Baines f6f4370fee
gnu: gnome: Include system-config-printer.
This package enables some functionality for printers within the
gnome-control-center as well as providing a standalone configuration tool.

At the moment, due to the lack of PackageKit support within Guix, the
gnome-control-center can't help users through the process of installing this,
so make it a default package.

* gnu/packages/gnome.scm (gnome)[propagated-inputs]: Add system-config-printer.
2019-02-13 08:19:05 +00:00
Christopher Baines dd1fcddcb8
gnu: Add system-config-printer.
* gnu/packages/gnome.scm (system-config-printer): New variable.
2019-02-13 08:19:05 +00:00
Ludovic Courtès a76d0f032b
gnu: gnome-shell: Customize the GDM log-in screen.
* gnu/packages/patches/gnome-shell-theme.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/gnome.scm (gnome-shell)[source](patches, modules)
(snippet): New fields.
[arguments]: Add 'rebuild-css' phase.
[native-inputs]: Add RUBY-SASS.
2019-02-10 23:25:01 +01:00
Ludovic Courtès 44a06c942c
gnu: gnome: Remove '--disable-acceleration-check' flag from 'gnome.desktop'.
With this change the GNOME session is now listed in the log-in screen of
GDM.

* gnu/packages/gnome.scm (gnome-session)[arguments]: Remove
'disable-hardware-acceleration-check' phase.  That phase was apparently
no longer needed.  Furthermore, GDM expects 'TryExec' to be a file name,
not a file name followed by arguments; thus, the option led GDM to
discard 'gnome.desktop' with "GdmSession: Command not found: TryExec".
2019-02-10 23:25:01 +01:00
Marius Bakke 44ed628466
gnu: tracker: Build against the regular SQLite.
FTS5 is enabled by default in the current version.

* gnu/packages/sqlite.scm (sqlite-with-fts5): Remove variable.
* gnu/packages/gnome.scm (tracker)[inputs]: Change from that to SQLITE.
2019-02-09 20:58:16 +01:00
Ludovic Courtès 50a93adc05
Merge branch 'staging' 2019-02-09 15:14:59 +01:00
Oleg Pykhalov 965ff0233e
gnu: gtk-vnc: Update to 0.9.0.
* gnu/packages/gnome.scm (gtk-vnc): Update to 0.9.0.
2019-02-04 22:44:53 +03:00
Tobias Geerinckx-Rice b29909b40e
gnu: Remove duplicate import from (gnu packages gnome).
* gnu/packages/messaging.scm (define-module): Remove duplicate module
imports.  Order the remainder alphabetically.
2019-02-04 09:39:12 +01:00
Ludovic Courtès 3e2d4e69c3
Merge branch 'master' into staging 2019-01-20 22:12:10 +01:00
Ricardo Wurmus 4b2ed6c2a3
gnu: Add libdazzle.
* gnu/packages/gnome.scm (libdazzle): New variable.
2019-01-18 20:29:28 +01:00
Ricardo Wurmus 255d1bbe77
gnu: Move dbm databases to new module.
* gnu/packages/databases.scm (gdbm, bdb, bdb-5.3): Move from here...
* gnu/packages/dbm.scm: ...to this new module.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
* gnu/packages/audio.scm,
gnu/packages/avahi.scm,
gnu/packages/backup.scm,
gnu/packages/cobol.scm,
gnu/packages/cyrus-sasl.scm,
gnu/packages/databases.scm,
gnu/packages/finance.scm,
gnu/packages/game-development.scm,
gnu/packages/gnome.scm,
gnu/packages/guile.scm,
gnu/packages/ibus.scm,
gnu/packages/kerberos.scm,
gnu/packages/linux.scm,
gnu/packages/mail.scm,
gnu/packages/man.scm,
gnu/packages/nvi.scm,
gnu/packages/openldap.scm,
gnu/packages/package-management.scm,
gnu/packages/php.scm,
gnu/packages/pulseaudio.scm,
gnu/packages/python.scm,
gnu/packages/rdf.scm,
gnu/packages/ruby.scm,
gnu/packages/sawfish.scm: Update module references.
2019-01-16 16:08:22 +01:00
Ricardo Wurmus cd0322a3ef
gnu: Move sqlite to separate module.
* gnu/packages/databases.scm (sqlite, sqlite-3.26.0, sqlite-with-fts5,
sqlite-with-column-metadata): Move variables from here...
* gnu/packages/sqlite.scm: ...to this new module.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
* gnu/packages/apl.scm,
gnu/packages/bittorrent.scm,
gnu/packages/calendar.scm,
gnu/packages/code.scm,
gnu/packages/crypto.scm,
gnu/packages/databases.scm,
gnu/packages/dc.scm,
gnu/packages/disk.scm,
gnu/packages/ebook.scm,
gnu/packages/education.scm,
gnu/packages/emacs.scm,
gnu/packages/emulators.scm,
gnu/packages/file-systems.scm,
gnu/packages/freedesktop.scm,
gnu/packages/ftp.scm,
gnu/packages/games.scm,
gnu/packages/geo.scm,
gnu/packages/gnome.scm,
gnu/packages/gnunet.scm,
gnu/packages/gnupg.scm,
gnu/packages/gnuzilla.scm,
gnu/packages/gps.scm,
gnu/packages/guile.scm,
gnu/packages/ibus.scm,
gnu/packages/kerberos.scm,
gnu/packages/kodi.scm,
gnu/packages/lisp.scm,
gnu/packages/mail.scm,
gnu/packages/messaging.scm,
gnu/packages/mpd.scm,
gnu/packages/music.scm,
gnu/packages/networking.scm,
gnu/packages/nfs.scm,
gnu/packages/ocaml.scm,
gnu/packages/package-management.scm,
gnu/packages/pdf.scm,
gnu/packages/photo.scm,
gnu/packages/php.scm,
gnu/packages/python.scm,
gnu/packages/qt.scm,
gnu/packages/ruby.scm,
gnu/packages/scheme.scm,
gnu/packages/sync.scm,
gnu/packages/syndication.scm,
gnu/packages/version-control.scm,
gnu/packages/video.scm,
gnu/packages/web-browsers.scm,
gnu/packages/webkit.scm: Adjust module references.
2019-01-16 16:08:22 +01:00
Ricardo Wurmus 44d10b1f72
gnu: Separate Python core packages from the rest.
* gnu/packages/python.scm: Move hundreds of package definitions from here...
* gnu/packages/python-xyz.scm: ...to this new module.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
* gnu/packages/ada.scm,
gnu/packages/admin.scm,
gnu/packages/android.scm,
gnu/packages/audio.scm,
gnu/packages/backup.scm,
gnu/packages/benchmark.scm,
gnu/packages/bioinformatics.scm,
gnu/packages/bittorrent.scm,
gnu/packages/calendar.scm,
gnu/packages/check.scm,
gnu/packages/chemistry.scm,
gnu/packages/cluster.scm,
gnu/packages/compression.scm,
gnu/packages/connman.scm,
gnu/packages/crypto.scm,
gnu/packages/cups.scm,
gnu/packages/databases.scm,
gnu/packages/dav.scm,
gnu/packages/direct-connect.scm,
gnu/packages/disk.scm,
gnu/packages/django.scm,
gnu/packages/dlang.scm,
gnu/packages/docker.scm,
gnu/packages/ebook.scm,
gnu/packages/elf.scm,
gnu/packages/emacs.scm,
gnu/packages/emulators.scm,
gnu/packages/engineering.scm,
gnu/packages/enlightenment.scm,
gnu/packages/finance.scm,
gnu/packages/fltk.scm,
gnu/packages/fontutils.scm,
gnu/packages/freedesktop.scm,
gnu/packages/game-development.scm,
gnu/packages/games.scm,
gnu/packages/geo.scm,
gnu/packages/gl.scm,
gnu/packages/glib.scm,
gnu/packages/gnome.scm,
gnu/packages/gnupg.scm,
gnu/packages/gnuzilla.scm,
gnu/packages/graph.scm,
gnu/packages/graphics.scm,
gnu/packages/graphviz.scm,
gnu/packages/gtk.scm,
gnu/packages/ham-radio.scm,
gnu/packages/image-processing.scm,
gnu/packages/image-viewers.scm,
gnu/packages/image.scm,
gnu/packages/irc.scm,
gnu/packages/jrnl.scm,
gnu/packages/julia.scm,
gnu/packages/kde-frameworks.scm,
gnu/packages/key-mon.scm,
gnu/packages/libffi.scm,
gnu/packages/libreoffice.scm,
gnu/packages/libusb.scm,
gnu/packages/lirc.scm,
gnu/packages/logging.scm,
gnu/packages/machine-learning.scm,
gnu/packages/mail.scm,
gnu/packages/mate.scm,
gnu/packages/maths.scm,
gnu/packages/medical.scm,
gnu/packages/messaging.scm,
gnu/packages/monitoring.scm,
gnu/packages/mp3.scm,
gnu/packages/mpd.scm,
gnu/packages/music.scm,
gnu/packages/networking.scm,
gnu/packages/nutrition.scm,
gnu/packages/openldap.scm,
gnu/packages/openstack.scm,
gnu/packages/package-management.scm,
gnu/packages/password-utils.scm,
gnu/packages/patchutils.scm,
gnu/packages/pdf.scm,
gnu/packages/photo.scm,
gnu/packages/polkit.scm,
gnu/packages/protobuf.scm,
gnu/packages/python-crypto.scm,
gnu/packages/python-web.scm,
gnu/packages/qt.scm,
gnu/packages/rdf.scm,
gnu/packages/ruby.scm,
gnu/packages/search.scm,
gnu/packages/selinux.scm,
gnu/packages/serialization.scm,
gnu/packages/shells.scm,
gnu/packages/simulation.scm,
gnu/packages/ssh.scm,
gnu/packages/statistics.scm,
gnu/packages/storage.scm,
gnu/packages/sync.scm,
gnu/packages/terminals.scm,
gnu/packages/textutils.scm,
gnu/packages/time.scm,
gnu/packages/tls.scm,
gnu/packages/tor.scm,
gnu/packages/tryton.scm,
gnu/packages/version-control.scm,
gnu/packages/video.scm,
gnu/packages/virtualization.scm,
gnu/packages/vpn.scm,
gnu/packages/web-browsers.scm,
gnu/packages/web.scm,
gnu/packages/wicd.scm,
gnu/packages/xdisorg.scm,
gnu/packages/xorg.scm: Update module references.
2019-01-15 14:46:44 +01:00
Marius Bakke 6764f94317
Merge branch 'master' into staging 2019-01-13 01:40:04 +01:00
Marius Bakke 66470a5ad0
gnu: libgxps: Update to 0.3.1.
* gnu/packages/gnome.scm (libgxps): Update to 0.3.1.
2019-01-13 01:25:17 +01:00
Marius Bakke c06ef010e3
gnu: libsecret: Update to 0.18.7.
* gnu/packages/gnome.scm (libsecret): Update to 0.18.7.
[native-inputs]: Remove INTLTOOL.  Add GETTEXT-MINIMAL.
2019-01-13 01:25:16 +01:00
Leo Famulari adf0b482eb
gnu: gexiv2: Update to 0.10.10.
* gnu/packages/gnome.scm (gexiv2): Update to 0.10.10.
2019-01-10 18:45:41 -05:00
Efraim Flashner 0e28967250
Merge remote-tracking branch 'origin/master' into staging 2019-01-09 10:52:41 +02:00
Efraim Flashner ac277bc7c5
gnu: libsecret: Update to 0.18.7.
* gnu/packages/gnome.scm (libsecret): Update to 0.18.7.
2019-01-04 09:20:50 +02:00
Efraim Flashner 0528f70d3d
gnu: goffice: Update to 0.10.44.
* gnu/packages/gnome.scm (goffice): Update to 0.10.44.
2019-01-04 09:20:48 +02:00
Efraim Flashner 1839768ca1
gnu: vinagre: Don't build icon-cache.
* gnu/packages/gnome.scm (vinagre)[arguments]: Add custom phase to
remove 'gtk-update-icon-cache'.
[native-inputs]: Remove gtk+-bin.
2018-12-30 20:22:59 +02:00
Efraim Flashner 684f97f8c9
gnu: vinagre: Update package for newer freerdp.
* gnu/packages/gnome.scm (vinagre)[source]: Update patches.
[arguments]: Add custom  phase to replace 'freerdp' with
'freerdp2'. Remove configure flags.
* gnu/packages/patches/vinagre-revert-1.patch,
gnu/packages/patches/vinagre-revert-2.patch: Remove files.
* gnu/packages/patches/vinagre-newer-freerdp.patch,
gnu/packages/patches/vinagre-newer-rdp-parameters.patch: New files.
* gnu/local.mk (dist_patch_DATA): Register changes.
2018-12-30 20:22:59 +02:00
Timothy Sample 89c8656200
gnu: gdm: Change locale settings file.
* gnu/packages/gnome.scm (gdm)[arguments]: Set the '--with-lang-file'
configure flag to '/etc/environment'.

Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
2018-12-30 10:20:39 +01:00
Timothy Sample 92deb5cc92
gnu: gdm: Pass XDG_DATA_DIRS into session environment.
* gnu/packages/gnome.scm (gdm)[arguments]: Update the pre-configure
phase so that GDM preserves the XDG_DATA_DIRS variable when setting up
the session environment.

Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
2018-12-30 10:20:38 +01:00
Efraim Flashner 1262be5c61
gnu: glib-networking: Work around test failure.
* gnu/packages/gnome.scm (glib-networking)[source]: Add patch.
* gnu/packages/patches/glib-networking-connection.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
2018-12-27 12:55:45 +02:00
Marius Bakke 6521155212
gnu: glib-networking: Update to 2.58.0.
* gnu/packages/gnome.scm (glib-networking): Update to 2.58.0.
[build-system]: Change to MESON-BUILD-SYSTEM.
[arguments]: Explicitly disable libproxy; add phase to appease tests.
(libgdata, libsoup)[arguments]: Remove phase that sets SSL_CERT_FILE.
* gnu/packages/spice.scm (spice)[arguments]: Likewise.
* gnu/packages/web.scm (uhttpmock)[arguments]: Likewise.
2018-12-12 20:49:14 +01:00
Marius Bakke 06f5bc4e12
gnu: GnuTLS: Update to 3.6.5.
* gnu/packages/patches/gnutls-skip-pkgconfig-test.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
* gnu/packages/tls.scm (gnutls): Update to 3.6.5.
[source](patches): Remove obsolete.
[source](snippet): Add Guile detection fix.
* gnu/packages/gnome.scm (libsoup)[arguments]: Adjust 'certtool' invokation to
cope with the new API.
2018-12-12 20:49:14 +01:00
Marius Bakke fbb7b04a85
Merge branch 'master' into staging 2018-12-09 00:18:32 +01:00
Marius Bakke 8a831c6f06
gnu: Remove more GCC ICE workarounds.
These were fixed with <https://bugs.gnu.org/31708>.

* gnu/packages/glib.scm (python-pygobject, python2-pygobject)[native-inputs]:
Remove GCC-7.
* gnu/packages/gnome.scm (gjs)[native-inputs]: Likewise.
[arguments]: Remove related phase.
2018-12-08 19:37:47 +01:00
Björn Höfling a18f8eaf61
gnu: arc-theme: Update to 20181022 and fix build.
* gnu/packages/gnome.scm (arc-theme)[version]: Update to 20181022.
[source]: Use new fork, change to git-fetch.
[inputs]: Remove and move gtk+ to native-inputs.
[native-inputs]: Add gtk+, glib:bin, gnome-shell, inkscape, optipng and sassc.
[home-page]: Adapt to new fork.
[license]: Fix to GPL 3 or later (gpl3+).

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2018-12-06 12:26:30 -05:00
Marius Bakke 4115e8ea3b
gnu: json-glib: Update to 1.4.4.
* gnu/packages/patches/json-glib-fix-tests-32bit.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
* gnu/packages/gnome.scm (json-glib): Update to 1.4.4.
[source](patches): Remove.
2018-12-04 20:05:20 +01:00
Ludovic Courtès 994b5b1d01
gnu: libbonobo: Build sequentially.
See
<https://berlin.guixsd.org/log/5mr1fyac5kyz41zwmnf4b0wm7vl42ryv-libbonobo-2.32.1>
for an example of a parallel build failure:

    CCLD   echo-client-2
    CCLD   bonobo-echo-2
  ld: libEcho.a(Bonobo_Sample_Echo-stubs.o): in function `Bonobo_Sample_Echo_echo':
  /tmp/guix-build-libbonobo-2.32.1.drv-0/libbonobo-2.32.1/samples/echo/Bonobo_Sample_Echo-stubs.c:12: undefined reference to `Bonobo_Sample_Echo__iinterface'
  ld: /tmp/guix-build-libbonobo-2.32.1.drv-0/libbonobo-2.32.1/samples/echo/Bonobo_Sample_Echo-stubs.c:12: undefined reference to `Bonobo_Sample_Echo__classid'
  ld: /tmp/guix-build-libbonobo-2.32.1.drv-0/libbonobo-2.32.1/samples/echo/Bonobo_Sample_Echo-stubs.c:12: undefined reference to `_ORBIT_skel_small_Bonobo_Sample_Echo_echo'
  collect2: error: ld returned 1 exit status
  make[3]: *** [Makefile:488: echo-client-2] Error 1

* gnu/packages/gnome.scm (libbonobo)[arguments]: Add #:parallel-build?.
2018-11-29 12:42:09 +01:00
Ludovic Courtès 892307aed5
gnu: orbit2: Specify upstream name.
* gnu/packages/gnome.scm (orbit2)[properties]: New field.
2018-11-27 13:53:14 +01:00
Ludovic Courtès 8aad2e32e5
gnu: orbit2: Do not build static libraries.
* gnu/packages/gnome.scm (orbit2)[arguments]: Add "--disable-static" to
 #:configure-flags.
2018-11-27 13:51:52 +01:00
Marius Bakke 4820b75de0
Merge branch 'master' into core-updates 2018-11-24 19:44:05 +01:00