mirror of
https://github.com/oxen-io/session-desktop.git
synced 2023-12-14 02:12:57 +01:00
# Conflicts: # .github/PULL_REQUEST_TEMPLATE.md # background.html # config/default.json # config/production.json # js/models/conversations.js # js/models/messages.js # js/views/conversation_view.js # js/views/inbox_view.js # js/views/settings_view.js # main.js # package.json # test/index.html # ts/components/conversation/ContactName.tsx # yarn.lock
25 KiB
25 KiB
<html>
<head>
</head>
</html>
![](/oxen-io/session-desktop/media/commit/88081007965a4eaacd870d20cf582479f8fd33bc/images/loki/loki_icon_128.png)