Merge remote-tracking branch 'origin/master' into release-prep-0.7.1
No related branches found
No related tags found
Showing
- .gitignore 3 additions, 1 deletion.gitignore
- CHANGELOG.md 2 additions, 1 deletionCHANGELOG.md
- resources/langs/nheko_de.ts 12 additions, 7 deletionsresources/langs/nheko_de.ts
- resources/langs/nheko_el.ts 12 additions, 7 deletionsresources/langs/nheko_el.ts
- resources/langs/nheko_en.ts 12 additions, 7 deletionsresources/langs/nheko_en.ts
- resources/langs/nheko_fi.ts 12 additions, 7 deletionsresources/langs/nheko_fi.ts
- resources/langs/nheko_fr.ts 12 additions, 7 deletionsresources/langs/nheko_fr.ts
- resources/langs/nheko_ja.ts 12 additions, 7 deletionsresources/langs/nheko_ja.ts
- resources/langs/nheko_nl.ts 12 additions, 7 deletionsresources/langs/nheko_nl.ts
- resources/langs/nheko_pl.ts 12 additions, 7 deletionsresources/langs/nheko_pl.ts
- resources/langs/nheko_ru.ts 12 additions, 7 deletionsresources/langs/nheko_ru.ts
- resources/langs/nheko_zh_CN.ts 12 additions, 7 deletionsresources/langs/nheko_zh_CN.ts
- src/ChatPage.h 1 addition, 0 deletionssrc/ChatPage.h
- src/MainWindow.cpp 4 additions, 0 deletionssrc/MainWindow.cpp
- src/Olm.cpp 1 addition, 1 deletionsrc/Olm.cpp
- src/UserSettingsPage.cpp 10 additions, 1 deletionsrc/UserSettingsPage.cpp
- src/UserSettingsPage.h 10 additions, 0 deletionssrc/UserSettingsPage.h
- src/Utils.cpp 3 additions, 2 deletionssrc/Utils.cpp
- src/Utils.h 0 additions, 1 deletionsrc/Utils.h
- src/timeline/TimelineModel.cpp 18 additions, 8 deletionssrc/timeline/TimelineModel.cpp
Loading
Please register or sign in to comment