Merge branch '2.3.x' of git.lyx.org:lyx into 2.3.x

This commit is contained in:
Uwe Stöhr 2018-02-12 19:04:25 +01:00
commit d1ac023b50

View File

@ -2373,7 +2373,6 @@ dist_templates_DATA = \
templates/aastex6.lyx \
templates/acmart.lyx \
templates/AEA.lyx \
templates/AGUTeX.lyx \
templates/APA.lyx \
templates/APA6.lyx \
templates/beamer-conference-ornate-20min.lyx \
@ -2420,6 +2419,7 @@ dist_obsoletetemplates_DATA = \
templates/obsolete/ACM-siggraph.lyx \
templates/obsolete/ACM-sigplan.lyx \
templates/obsolete/ACM-SIGS.lyx \
templates/obsolete/AGUTeX.lyx \
templates/obsolete/g-brief-de.lyx \
templates/obsolete/g-brief-en.lyx