chirac 6c17301763 Merge branch 'master' into 'fingerprintssh' ... # Conflicts: # machines/templates/machines/aff_machines.html # re2o/views.py		2018-07-22 22:51:55 +02:00
..
machines	Merge branch 'master' into 'fingerprintssh'	2018-07-22 22:51:55 +02:00