Merge remote-tracking branch 'origin/dev' into dev (08a152d5) · Commits · clients / python / sakia · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

sakia
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

This is an archived project. Repository and other project resources are read-only.

08a152d5

Commit 08a152d5 authored 9 years ago by Vincent Texier

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/cutecoin/gui/informations_tab.py

parents abad19a0 927690b4

No related branches found

No related tags found

No related merge requests found

Changes 6

Expand all Hide whitespace changes

Inline Side-by-side

Showing

res/i18n/ts/fr_FR.ts 106 additions, 87 deletions

res/i18n/ts/fr_FR.ts
res/ui/about.ui 7 additions, 1 deletion

res/ui/about.ui
src/cutecoin/core/app.py 2 additions, 2 deletions

src/cutecoin/core/app.py
src/cutecoin/gui/informations_tab.py 2 additions, 2 deletions

src/cutecoin/gui/informations_tab.py
src/cutecoin/gui/mainwindow.py 10 additions, 5 deletions

src/cutecoin/gui/mainwindow.py
src/cutecoin/gui/preferences.py 3 additions, 0 deletions

src/cutecoin/gui/preferences.py

with 130 additions and 97 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment