imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/querystring

Browse source 
 Conflicts:
	package.json
	src/@types/global.d.ts
	src/components/views/elements/AppTile.js
	src/utils/HostingLink.js
	yarn.lock
This commit is contained in:
Michael Telatynski 2021-07-16 12:47:33 +01:00
commit 5dbd79c729
1950 changed files with 174795 additions and 76807 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/utils/HostingLink.js
View file

@ -17,8 +17,8 @@ limitations under the License.
import url from 'url';
import SdkConfig from '../SdkConfig';
import {MatrixClientPeg} from '../MatrixClientPeg';
import {urlSearchParamsToObject} from "./UrlUtils";
import { MatrixClientPeg } from '../MatrixClientPeg';
import { urlSearchParamsToObject } from "./UrlUtils";
export function getHostingLink(campaign) {
const hostingLink = SdkConfig.get().hosting_signup_link;