be4311c07e14feb728abc6425ee606ffaa611a58
markd
  Fri Jan 22 06:46:58 2021 -0800
merge with master

diff --git confs/asia.hg.conf confs/asia.hg.conf
index 4c95b8f..95dfc9e 100644
--- confs/asia.hg.conf
+++ confs/asia.hg.conf
@@ -131,15 +131,19 @@
 # Name prefix of 31 separate databases (one for each day of month, on same
 # server as customTrash, using customTracks.* profile) for custom track
 # database tables that belong to users' saved sessions, analogous to
 # sessionDataDir setting for saved session files.
 # The databases must be named as this prefix followed by {01, 02, 03, ... 31}.
 # For example, if the value is "customData" then the databases are named
 # customData01, customData02, ... customData31.
 sessionDataDbPrefix=customData
 
 # Recommended track sets refs #25601
 browser.recTrackSets=on
 
 # Enable hgPhyloPlace:
 hgPhyloPlaceEnabled=on
 nextstrainHost=https://nextstrain.org
+
+# Enable FreeType fonts
+#freeType=on
+freeTypeDir=/usr/share/X11/fonts/Type1