Merge branch 'master' of github.com:bioidiap/bob.db.arface

Conflicts: version.txt
bioidiap · Dec 17, 2015 · 9586956 · 9586956
2 parents eb9cf41 + 8cc723f
commit 9586956
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-2.0.5b0
+2.0.5b0