Dan Stillman d8025be676 Ignore sanitization changes when comparing notes in conflict ... Until we have a consistent way of sanitizing HTML on client and server, account for differences manually. More differences between HTMLPurifier and TinyMCE should be added as necessary.		2016-05-17 02:33:53 -04:00
..
content	Ignore sanitization changes when comparing notes in conflict	2016-05-17 02:33:53 -04:00
locale	Add file sync info/link to File Not Found dialog	2016-05-15 04:24:00 -04:00
skin/default/zotero	Align "Set Up Syncing" button in prefs	2016-04-26 16:27:26 -04:00