Viewing all changes in revision 347.

Committer: GitHub
Author(s): szszszsz
Date: 2016-11-22 13:09:31 UTC
mfrom: <a title="Merged From 346.1.1" href="/~nitrokey/nitrokey/release/revision/346.1.1">(346.1.1)
Revision ID: git-v1:5ec529499c2fbdf9a9bba18d92e68f03a398f577

Merge pull request #194 from vladimir-lu/patch-1

Resolve conflict with udev rules (for Fedora 23)

added added

removed removed