Merge branch 'ISIS-1521_pr-60'
Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/9998c750 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/9998c750 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/9998c750 Branch: refs/heads/master Commit: 9998c75075de4a93538bfc13e5b9c9a08aa2b3fa Parents: 4c856ab 029a342 Author: Dan Haywood <[email protected]> Authored: Tue Nov 1 22:21:52 2016 +0000 Committer: Dan Haywood <[email protected]> Committed: Tue Nov 1 22:21:52 2016 +0000 ---------------------------------------------------------------------- .gitignore | 1 - README.adoc | 6 +++--- .../main/asciidoc/guides/_rgcfg_deployment-types.adoc | 2 +- .../asciidoc/guides/_rgcms_methods_prefixes_hide.adoc | 4 ++-- .../guides/_rgcms_methods_reserved_iconName.adoc | 2 +- .../guides/_tg_stop-scaffolding-start-coding.adoc | 12 ++++++------ .../asciidoc/guides/_ugfun_how-tos_domain-services.adoc | 2 +- 7 files changed, 14 insertions(+), 15 deletions(-) ----------------------------------------------------------------------
