Files @ 15e507047bae
Branch filter:

Location: kallithea/rhodecode/tests/fixtures/hg_diff_copy_chmod_and_edit_file.diff - annotation

Bradley M. Kuhn
Incorporate CSS from select2-bootstrap-css & its license information.

RhodeCode 2.2.5 included a modified version of this upstream work. We
include herein the upstream version as downloaded and incorporated using the
following commands:

(cd /tmp; \
git clone https://github.com/t0m/select2-bootstrap-css
)
cp /tmp/select2-bootstrap-css/select2-bootstrap.css rhodecode/public/js/select2/

The content used to be appended to select2.css but we now keep it in a separate
file select2-bootstrap.css . This file could be included in root.html like
select2.css but we do currently not want to use bootstrap.

The license info was incorporated from /tmp/select2-bootstrap-css/LICENSE
into our LICENSE.md file.
diff --git a/file4 b/file5
old mode 100755
new mode 100644
copy from file4
copy to file5
--- a/file4
+++ b/file5
@@ -1,3 +1,4 @@
-line1
 line2
 line3
+line4
+line5