Merge commit '2a7e36f6052d9a0a3d7bc83758f35437222343d0'

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
Simple merge

diff --cc cgilite/file.sh
Simple merge

diff --cc cgilite/markdown.awk
Simple merge

diff --cc cgilite/session.sh
Simple merge

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