Skip to content
Commit 10253cae authored by Ondřej Sotolář's avatar Ondřej Sotolář
Browse files

Merge branch 'api21-compatibility' into 'master' 

Api21 compatibility

See merge request xsotolar/irtis-data-collector!8
parents 65fb73ed f87b5b09
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment