Merge branch 'master' into master

Changed files (1)

• modified libbirdfont/SearchPaths.vala

Diff

diff --git a/libbirdfont/SearchPaths.vala b/libbirdfont/SearchPaths.valaindex dfd0a4f..f7afdf8 100644--- a/libbirdfont/SearchPaths.vala+++ b/libbirdfont/SearchPaths.vala@@ -50,6 +50,7 @@ public class SearchPaths { 				if (f.query_exists ()) return f;	  				f = get_file (folder + "/../", name);+ 				if (f.query_exists ()) return f;  				f = get_file (folder + "/../share/birdfont/", name);