Merge branch 'master' of https://code.briarproject.org/akwizgran/briar into 40-forgotten-password (7e9cff31) · Commits · Julian Dehm / briar · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

briar
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

7e9cff31

Commit 7e9cff31 authored 9 years ago by Ernir Erlingsson

Downloads
- Plain Diff

Merge branch 'master' of https://code.briarproject.org/akwizgran/briar into 40-forgotten-password

Conflicts:
	.gitignore
	briar-android/briar-android.iml

parents 2052c845 4497612a

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 5 additions, 3 deletions

.gitignore
briar-api/briar-api.iml 0 additions, 32 deletions

briar-api/briar-api.iml
briar-core/briar-core.iml 0 additions, 36 deletions

briar-core/briar-core.iml
briar-desktop/briar-desktop.iml 0 additions, 43 deletions

briar-desktop/briar-desktop.iml
briar-tests/briar-tests.iml 0 additions, 47 deletions

briar-tests/briar-tests.iml

with 5 additions and 161 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