From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 interface/web/themes/default/assets/fonts/glyphicons-halflings-regular.ttf |    0 
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/interface/web/themes/default/assets/fonts/glyphicons-halflings-regular.ttf b/interface/web/themes/default/assets/fonts/glyphicons-halflings-regular.ttf
new file mode 100644
index 0000000..67fa00b
--- /dev/null
+++ b/interface/web/themes/default/assets/fonts/glyphicons-halflings-regular.ttf
Binary files differ

--
Gitblit v1.9.1