17.5.2-beta
# Conflicts: # Rock.Rest/v2/ControlsController.cs # Rock.Version/AssemblySharedInfo.cs # Rock.Version/AssemblySharedInfo.tt # Rock/Rock.csproj
# Conflicts: # Rock.Rest/v2/ControlsController.cs # Rock.Version/AssemblySharedInfo.cs # Rock.Version/AssemblySharedInfo.tt # Rock/Rock.csproj