Commit 14d14b63 authored by Alexandra Panyukova's avatar Alexandra Panyukova

Merge branch 'default' into default-server

Conflicts: .gear-rules
parents 5659053e 27f8257a
tar: . name=branding-altlinux-office-server-@version@ tar: . name=branding
...@@ -25,7 +25,7 @@ BuildRequires: ImageMagick fontconfig ...@@ -25,7 +25,7 @@ BuildRequires: ImageMagick fontconfig
Packager: Anton V. Boyarshinov <boyarsh at altlinux dot org> Packager: Anton V. Boyarshinov <boyarsh at altlinux dot org>
Source: %name-%version.tar Source: branding.tar
Group: Graphics Group: Graphics
Summary: System/Base Summary: System/Base
...@@ -163,7 +163,7 @@ Requires(post): indexhtml-common ...@@ -163,7 +163,7 @@ Requires(post): indexhtml-common
ALT Linux index.html welcome page. ALT Linux index.html welcome page.
%prep %prep
%setup -q %setup -n branding
%build %build
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment