• Andrey Cherepanov's avatar
    Merge branch 'school-server' into school-master · 000989f5
    Andrey Cherepanov authored
    Conflicts:
    	Makefile.in
    	branding.spec
    	components/ahttpd/images/groups/datetime.png
    	components/ahttpd/images/groups/firewall.png
    	components/ahttpd/images/groups/mail.png
    	components/ahttpd/images/groups/network.png
    	components/ahttpd/images/groups/pkg.png
    	components/ahttpd/images/groups/servers.png
    	components/ahttpd/images/groups/system.png
    	components/ahttpd/images/groups/users.png
    	components/ahttpd/images/groups/xorg.png
    	components/ahttpd/images/steps/install2-preinstall.png
    	components/ahttpd/images/steps/timezone.png
    	components/ahttpd/styles/alterator.css.in
    	components/bootloader/config.in
    	components/bootloader/gfxboot.cfg.in
    	components/browser-qt/design/design.qss.in
    	components/indexhtml/index-en.html.in
    	components/indexhtml/index-ru.html.in
    	components/indexhtml/index.css
    	components/systemd/os-release.in
    	configure.ac
    	gnome-settings/index.theme.in
    	gnome-settings/metacity-theme-1.xml.in
    	images/background16x9.png
    	images/background4x3.png
    	images/boot.png
    	images/grub.png
    	images/product-logo.png
    	notes/index-ru.html.in
    	slideshow/README
    000989f5