[geeklog-cvs] geeklog-1.3/docs history,1.206,1.207

[vinny at iowaoutdoors.org]

Update of /var/cvs/geeklog-1.3/docs
In directory www:/tmp/cvs-serv7689/docs

Modified Files:
	history 
Log Message:
Replaced array_merge with array_merge_recursive when merging admin_html and 
user_html allowable html.


Index: history
===================================================================
RCS file: /var/cvs/geeklog-1.3/docs/history,v
retrieving revision 1.206
retrieving revision 1.207
diff -C2 -d -r1.206 -r1.207
*** history	18 Jul 2004 12:02:33 -0000	1.206
--- history	19 Jul 2004 01:30:05 -0000	1.207
***************
*** 4,7 ****
--- 4,8 ----
  ------------
  
+ - The admin_html and user_html are now merged recursively (bug #240) [Vinny]
  - Remove colons from email addresses, as they have a special meaning,
    according to RFC(2)822, that we didn't intend (bug #6) [Dirk]