OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'develop' into release/3.0.0

pull/3581/head
Chocobozzz 2021-01-11 09:06:44 +01:00
parent f42c21528b 04b2996bb0
commit 7e4e8119e1
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/app/+my-account/my-account-applications/my-account-applications.component.ts
View File

@ -14,7 +14,7 @@ export class MyAccountApplicationsComponent implements OnInit {
feedUrl: string
feedToken: string
private baseURL = environment.originServerUrl
private baseURL = environment.originServerUrl || window.location.origin
constructor (
private authService: AuthService,

2
client/src/app/modal/quick-settings-modal.component.html
View File

@ -5,7 +5,7 @@
</div>
<div class="modal-body">
<div class="mb-4 font-italic">These settings apply only to your session on this instance.</div>
<div i18n class="mb-4 font-italic">These settings apply only to your session on this instance.</div>
<div i18n class="mb-4 quick-settings-title">Display settings</div>