2 Commits

Author	SHA1	Message	Date
Nathan Gray	019bfb1c93	Changes to file merge ... - Remove accidentally committed debug - Make URL into web-accessable URL - Add clickable link placeholder - Format custom field date/times according to user preference - Add rel_path placeholder, includes path+name relative to current directory	2012-05-07 15:53:28 +00:00
Nathan Gray	081d93ae51	Implement merge for filemanager	2012-05-03 17:58:16 +00:00