# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

Merge done to enable documentation be be fixed, because of removal of
alias directive and addition of related algorithms directive.

Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>

Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>

Also use one instance of the algorithm

Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>

Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>

Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>

Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>

This required reordering of these functions

Also hopefully final stage or renaming

Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>

Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>

Also make method and its arguments const

Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>

Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>

Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>

Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>

Added deprecation notice to ISIS Reflectometry (Old).

Muon analysis and results table

Dev-docs: instrument view and logging

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

Applied clang-tidy modernize-use-nullptr fixes for MantidPlot/

Applied clang-tidy modernize-use-nullptr fixes for qt/

Improve directtools Python module documentation

Muon Analysis bug that disabled fit menu

OSX Muon Interface (No need for data)

Documentation CreateSampleWorkspace

Fix broken link in UnitFactory.rst

Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>

Fixed categories to remove Python algorithm

Fix or suppress warnings from clang 6.0