Skip to content
Commit f49becb7 authored by Moritz Ulrich's avatar Moritz Ulrich
Browse files

Merge branch 'master' into dropbox-py 



Signed-off-by: default avatarMoritz Ulrich <moritz@tarn-vedra.de>

Conflicts:
	pkgs/top-level/all-packages.nix
parents f071e856 69ad5c5c
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment