Vladimír Čunát 0957359568 Merge branch 'staging'

2016-01-22 13:48:35 +01:00

..

applications

Merge branch 'staging'

2016-01-22 13:48:35 +01:00

build-support

Merge branch 'staging'

2016-01-22 13:48:35 +01:00

data

geolite-legacy 2016-01-11 -> 2016-01-18

2016-01-18 15:22:40 +01:00

desktops

gnome3*.epiphany: fix https when not running gnome-3

2016-01-21 11:43:16 +01:00

development

Merge branch 'staging'

2016-01-22 13:48:35 +01:00

games

Merge branch 'staging'

2016-01-22 13:48:35 +01:00

misc

Merge branch 'staging'

2016-01-22 13:48:35 +01:00

os-specific

Merge branch 'staging'

2016-01-22 13:48:35 +01:00

servers

Merge branch 'staging'

2016-01-22 13:48:35 +01:00

shells

fish: fix merge conflict

2016-01-05 23:32:29 +01:00

stdenv

Merge branch 'master' into staging

2016-01-18 09:48:49 +01:00

test

…

tools

Merge branch 'staging'

2016-01-22 13:48:35 +01:00

top-level

Merge branch 'staging'

2016-01-22 13:48:35 +01:00