Merge branch 'dm42fixes' into 'dev'

fix exclusion of redmatrix theme

See merge request hubzilla/core!1263
This commit is contained in:
Mario 2018-08-24 14:33:04 +02:00
commit 7fc4292ed8

2
.gitignore vendored
View File

@ -37,7 +37,7 @@ pageheader.html
doc/SiteTOS.md doc/SiteTOS.md
# themes except for redbasic # themes except for redbasic
view/theme/* view/theme/*
! view/theme/redbasic !view/theme/redbasic
# site theme schemas # site theme schemas
view/theme/redbasic/schema/default.php view/theme/redbasic/schema/default.php
# Doxygen API documentation, run 'doxygen util/Doxyfile' to generate it # Doxygen API documentation, run 'doxygen util/Doxyfile' to generate it