Merge commit '00aa1675c49f23eb075d1fc7ceb69bac5e1ba83c'

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/session.sh
Simple merge

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