Merge branch 'master' into school-master
Conflicts:
branding.spec
notes/license.all.html.in
notes/license.ru.html.in
Showing
gnome-settings/settings.menu
0 → 100644
indexhtml/img/altlinux-logo.png
100755 → 100644
File mode changed from 100755 to 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
File added
File added
File added
File added
File added
28.4 KB