Damian Mooyman c6c609a4c9 Merge remote-tracking branch 'origin/3.1' ... # Conflicts: # code/forms/UserForm.php # code/model/UserDefinedForm.php # code/model/editableformfields/EditableFileField.php # code/model/editableformfields/EditableOption.php		2016-08-18 10:20:56 +12:00
..
userguide	DOCS Userguide documentation improvements	2015-12-09 15:19:23 +13:00
compiling-front-end-files.md	Updated documentation	2015-08-21 11:21:40 +12:00
index.md	DOCS Userguide documentation improvements	2015-12-09 15:19:23 +13:00
installation.md	BUGFIX progress bar button text change breaks buttons	2016-07-14 09:29:25 -05:00
troubleshooting.md	Added user documentation.	2014-07-22 14:53:18 +12:00