Merge commit '22cff303ffb275439156c95e454c95c1b0864dae'

diff --cc cgilite/.gitignore
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..5c9950ae1c74eb4a290c3887873f567f85c3de4d
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/cgilite/.gitignore
@@@ -1,0 -1,0 +1,3 @@@
++cgilite
++serverkey
++users.db

diff --cc cgilite/cgilite.sh
Simple merge

diff --cc cgilite/common.css
index 0000000000000000000000000000000000000000,359f07d138b7ef91f1441a2738dd1352bbefecb6..359f07d138b7ef91f1441a2738dd1352bbefecb6
mode 000000,100644..100644
--- /dev/null
--- 2/common.css
+++ b/cgilite/common.css

diff --cc cgilite/file.sh
Simple merge

diff --cc cgilite/markdown.awk
index 0000000000000000000000000000000000000000,d28c7cfc760a2ed6c9fde6e040a2bf981c008b38..d28c7cfc760a2ed6c9fde6e040a2bf981c008b38
mode 000000,100755..100755
--- /dev/null
--- 2/markdown.awk
+++ b/cgilite/markdown.awk

diff --cc cgilite/session.sh
Simple merge

diff --cc cgilite/storage.sh
Simple merge

diff --cc cgilite/users.sh
index 0000000000000000000000000000000000000000,873edf05ffbb72fa9729ff1eb7792c39ac2a86c3..873edf05ffbb72fa9729ff1eb7792c39ac2a86c3
mode 000000,100755..100755
--- /dev/null
--- 2/users.sh
+++ b/cgilite/users.sh