Merge remote branch 'origin' into HEAD

diff --git a/Documentation/web/server/GNUmakefile b/Documentation/web/server/GNUmakefile
index b8e004a8884ebf3f5ae52c40bacb3d66acf27105..99edf28d03fbe0b3f9a0e2b496a8960a03d823c6 100644 (file)
--- a/Documentation/web/server/GNUmakefile
+++ b/Documentation/web/server/GNUmakefile
@@ -2,6 +2,6 @@ depth=../../..
 LOCALSTEPMAKE_TEMPLATES = ly
 include $(depth)/make/stepmake.make
 
-EXTRA_DIST_FILES = favicon.ico robots.txt
+EXTRA_DIST_FILES = favicon.ico robots.txt tweets.xml
 EXTRA_DIST_FILES += lilypond.org.htaccess website-dir.htaccess