Parnell Springmeyer a26a796d5c Merging against master - updating smokingpig, rebase was going to be messy		2017-01-26 02:00:04 -08:00
..
default.nix	gitlab: 8.15.4 -> 8.16.1	2017-01-24 21:29:06 +01:00
Gemfile	gitlab: 8.15.4 -> 8.16.1	2017-01-24 21:29:06 +01:00
Gemfile.lock	gitlab: 8.15.4 -> 8.16.1	2017-01-24 21:29:06 +01:00
gemset.nix	gitlab: 8.15.4 -> 8.16.1	2017-01-24 21:29:06 +01:00
nulladapter.patch	gitlab: 8.13.5 -> 8.15.4	2017-01-15 17:27:28 +01:00
remove-hardcoded-locations.patch	setcap-wrapper: Merging with upstream master and resolving conflicts	2017-01-25 11:08:05 -08:00