Skip to content

Commit

Permalink
Merge pull request #1303 from ONLYOFFICE/feature/merge-ref
Browse files Browse the repository at this point in the history
Merge linux packages fixes
  • Loading branch information
agolybev authored Jul 30, 2024
2 parents 4c1904a + 8544ab5 commit 80f003a
Show file tree
Hide file tree
Showing 34 changed files with 230 additions and 468 deletions.
27 changes: 9 additions & 18 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,33 +9,24 @@ win-linux/extras/online-installer/build
win-linux/ASCDocumentEditor.build/*
win-linux/res/gresource.c

win-linux/package/linux/index.html
win-linux/package/windows/index.html

win-linux/package/linux/common/opt
win-linux/package/linux/common/usr/share/applications/variables.m4
win-linux/package/linux/common/usr/share/flyfm/templates/desktopeditors.*.desktop
win-linux/package/linux/common/usr/share/doc/*/*
win-linux/package/linux/common/help
/win-linux/package/linux/deb*/build
/win-linux/package/linux/deb*/*.buildinfo
/win-linux/package/linux/deb*/*.changes
/win-linux/package/linux/deb*/*.ddeb
/win-linux/package/linux/deb*/*.deb
win-linux/package/linux/rpm/builddir
win-linux/package/linux/apt-rpm/builddir
win-linux/package/linux/urpmi/builddir
win-linux/package/linux/suse-rpm/builddir
win-linux/package/linux/build
win-linux/package/linux/deb*/build
win-linux/package/linux/deb*/*.buildinfo
win-linux/package/linux/deb*/*.changes
win-linux/package/linux/deb*/*.ddeb
win-linux/package/linux/deb*/*.deb
win-linux/package/linux/rpm*/build
win-linux/package/linux/rpm*/*desktopeditors.spec
win-linux/package/linux/tar


common/loginpage/res/img/generated/*
common/loginpage/build/plugins/*
common/**/node_modules/*
common/loginpage/deploy/*
common/loginpage/src/dlglogin.min.js
common/converter/*
common/changes/*/changes_???
common/changes/*/news_???
*/.svn/*

.DS_Store
Expand Down
Loading

0 comments on commit 80f003a

Please sign in to comment.