Riccardo Spagni
82375f7de7
Merge pull request #2806
...
da706b61
2017-11-25 19:51:28 +02:00
Riccardo Spagni
df032aac69
Merge pull request #2800
...
0b726be79d505d26
2017-11-25 19:50:58 +02:00
Riccardo Spagni
1de386111f
Merge pull request #2797
...
7e387fb1
2017-11-25 19:50:21 +02:00
Riccardo Spagni
539f511eb1
Merge pull request #2368
...
b0b7e0f0
2017-11-25 19:48:56 +02:00
Riccardo Spagni
d80a3e5c38
Merge pull request #2788
...
9739da1e01dc829783fa9047
2017-11-25 19:47:05 +02:00
moneromooo-monero
9739da1e84
wallet_rpc_server: new relay_tx command
...
It takes a full tx+metadata hex string as input
2017-11-24 14:03:55 +00:00
moneromooo-monero
01dc829784
wallet: transfer RPC can now return tx metadata (pending_tx)
2017-11-24 14:03:52 +00:00
moneromooo-monero
d875a9ff90
wallet2: detect multiple outputs from a tx to different subaddresses
2017-11-21 23:22:15 +00:00
stoffu
b0b7e0f09a
Spend proof without txkey
2017-11-21 16:49:16 +09:00
stoffu
be1c01298a
fix for tx proof: use exception instead of error_str when signature gen failed
2017-11-21 16:48:22 +09:00
Riccardo Spagni
8d9e4920fc
Merge pull request #2768
...
ef941855
2017-11-20 12:08:31 +09:00
stoffu
998777ecd7
Tx proof (revised):
...
- refactoring: proof generation/checking code was moved from simplewallet.cpp to wallet2.cpp
- allow an arbitrary message to be signed together with txid
- introduce two types (outbound & inbound) of tx proofs; with the same syntax, inbound is selected when <address> belongs to this wallet, outbound otherwise. see GitHub thread for more discussion
- wallet RPC: added get_tx_key, check_tx_key, get_tx_proof, check_tx_proof
- wallet API: moved WalletManagerImpl::checkPayment to Wallet::checkTxKey, added Wallet::getTxProof/checkTxProof
- get_tx_key/check_tx_key: handle additional tx keys by concatenating them into a single string
2017-11-18 20:44:27 +09:00
Cifrado
b0426d4cf2
Fixes #759 Add sanity check on restore height
2017-11-17 08:35:59 +01:00
moneromooo-monero
51895fd7df
split wallet and wallet_api
...
This speeds up building a lot when wallet2.h (or something it
includes) changes, since all the API includes wallet2.h
2017-11-16 12:10:29 +00:00
moneromooo-monero
6cbe7bcdd2
wallet2: check generate_key_derivation return value
2017-11-16 10:31:47 +00:00
stoffu
6171238416
daemon & simplewallet: don't set max-concurrency when unspecified
2017-11-16 08:03:25 +09:00
Tim L
ef941855ae
Wallet RPC: Add prompt-for-password flag
2017-11-15 13:21:55 -05:00
moneromooo-monero
0b726be703
wallet2: minimize the number of construct_tx calls
2017-11-15 18:01:35 +00:00
moneromooo-monero
9d505d26b8
wallet2: cleanup some debug logs
2017-11-15 18:01:32 +00:00
Michał Sałaban
0d149f708f
Add out-of-bound exceptions and handle them in RPC
2017-11-15 16:35:14 +01:00
stoffu
c4587e83f8
simplewallet: wrong ns for input_line in sweep_single ( fix #2634 )
2017-11-15 20:45:58 +09:00
Riccardo Spagni
3abd6f1fd0
Merge pull request #2773
...
ffe5b857
2017-11-15 11:24:08 +02:00
Riccardo Spagni
c9a410e394
Merge pull request #2772
...
5d92c7cc
2017-11-15 11:23:22 +02:00
Riccardo Spagni
0d4d628805
Merge pull request #2634
...
b738f4b5
2017-11-15 11:17:01 +02:00
Riccardo Spagni
39bc39b86e
Merge pull request #2628
...
7cb303a4
2017-11-15 11:14:58 +02:00
stoffu
b738f4b59d
wallet: add sweep_single command
2017-11-15 17:51:54 +09:00
stoffu
a17b8233da
wallet2 bugfix: loading old m_unconfirmed_payments
2017-11-15 17:30:49 +09:00
Howard Chu
987eb662bf
More missed readline dependencies thru scoped_message_writer
2017-11-14 22:43:52 +00:00
Howard Chu
95e784ad00
Fix 437421ce42
...
Missing an error argument for an exception
2017-11-14 20:29:05 +00:00
anonimal
a3ea62f209
CMake: include RPC when building GUI deps
2017-11-14 19:45:58 +00:00
Riccardo Spagni
815e158bdf
Merge pull request #2739
...
99f398a2
2017-11-14 21:32:13 +02:00
Riccardo Spagni
edebe4e3b6
Merge pull request #2736
...
0d9c0db9178014c9a9e14a19437421cee89994e9ec5135e5082db75f
2017-11-14 21:31:51 +02:00
Riccardo Spagni
5de492be40
Merge pull request #2629
...
383ff4f6
2017-11-14 21:29:49 +02:00
moneromooo-monero
99f398a25e
wallet2: avoid growing the short history when refreshing in a loop
2017-11-14 17:09:11 +00:00
Howard Chu
0d9c0db996
Do not build against epee_readline if it was not built
2017-11-14 17:06:37 +00:00
moneromooo-monero
178014c995
split off readline code into epee_readline
2017-11-14 17:06:35 +00:00
moneromooo-monero
437421ce42
wallet: move some scoped_message_writer calls from the libs
2017-11-14 17:06:29 +00:00
moneromooo-monero
e89994e98f
wallet: rejig to avoid prompting in wallet2
...
wallet2 is a library, and should not prompt for stdin. Instead,
pass a function so simplewallet can prompt on stdin, and a GUI
might display a window, etc.
2017-11-14 17:06:26 +00:00
moneromooo-monero
383ff4f689
remove "using namespace std" from headers
...
It's nasty, and actually breaks on Solaris, where if.h fails to
build due to:
struct map *if_memmap;
2017-11-14 16:56:10 +00:00
Riccardo Spagni
f48aeab5c4
Merge pull request #2756
...
0bf09154
2017-11-14 16:02:28 +02:00
Riccardo Spagni
910218b14e
Merge pull request #2755
...
d70515fc
2017-11-14 15:57:25 +02:00
Riccardo Spagni
55603627c9
Merge pull request #2745
...
6cf33446
2017-11-14 15:31:40 +02:00
Riccardo Spagni
29d77e5686
Merge pull request #2727
...
9d6c6c5d
2017-11-14 15:21:58 +02:00
moneromooo-monero
7cb303a44b
wallet2: simplify incoming tx processing code
2017-11-14 13:20:51 +00:00
Riccardo Spagni
25b97ee937
Merge pull request #2624
...
2677ade5da8b60cb
2017-11-14 15:20:45 +02:00
Riccardo Spagni
cdab85db41
Merge pull request #2701
...
867b67c4
2017-11-14 15:15:25 +02:00
Riccardo Spagni
2458ff1a6d
Merge pull request #2697
...
d269bff2
2017-11-14 15:14:07 +02:00
moneromooo-monero
da8b60cbbf
simplewallet: reject attempts to use too low mixin early
...
This yields a clear error message rather then some possibly
confusing more technical errors down the line
2017-11-14 13:12:39 +00:00
Riccardo Spagni
2ddb894607
Merge pull request #2661
...
ac4018a7#2656 ) (kenshi84)
2017-11-14 15:01:25 +02:00
Riccardo Spagni
395025bb23
Merge pull request #2633
...
ad96c478
2017-11-14 14:56:07 +02:00
Riccardo Spagni
3fff292dc1
Merge pull request #2509
...
ccf53a56
2017-11-14 14:50:03 +02:00
binaryFate
da706b6102
Fix false GCC warning '‘*((void*)& subaddr_account +4)’ may be used unitialized'
2017-11-14 09:45:43 +01:00
stoffu
ad96c478b1
wallet-cli: added --generate-from-spend-key option
2017-11-14 16:30:59 +09:00
moneromooo-monero
d269bff2ab
wallet2: use a vector, not a list, for selected_transfers
...
Friendlier on memory/speed, we know in advance the max amount
of items, which are small and constant size, and there's a lot
of list walking involved.
2017-11-13 19:36:18 +00:00
moneromooo-monero
7e387fb1ad
wallet2: only add a dummy 0 output if there's one output otherwise
2017-11-13 14:08:10 +00:00
Michał Sałaban
ffe5b857e1
Correct totals computation
2017-11-08 12:09:50 +01:00
moneromooo-monero
5d92c7ccf6
wallet2: typo fix in error message
2017-11-07 14:04:40 +00:00
stoffu
37c3792b00
wallet2 bugfix: supply missing subaddr_account arg to balance() and unlocked balance()
2017-11-06 10:15:38 +09:00
moneromooo-monero
ccf53a566c
track double spending in the txpool
...
Transactions in the txpool are marked when another transaction
is seen double spending one or more of its inputs.
This is then exposed wherever appropriate.
Note that being marked with this "double spend seen" flag does
NOT mean this transaction IS a double spend and will never be
mined: it just means that the network has seen at least another
transaction spending at least one of the same inputs, so care
should be taken to wait for a few confirmations before acting
upon that transaction (ie, mostly of use for merchants wanting
to accept unconfirmed transactions).
2017-11-06 00:05:44 +00:00
Riccardo Spagni
3dd31d33fa
Merge pull request #2605
...
b370ef54
2017-11-06 01:56:06 +02:00
Riccardo Spagni
32b083d8bd
Merge pull request #2546
...
b2d416f2
2017-11-06 01:53:43 +02:00
Tim L
0bf0915446
Fix file permission issue
...
This branch fixes a file permission issue introduced by 69c37200aa
2017-11-03 11:27:50 -04:00
Maxime THIEBAUT
d70515fca4
Used declared default refresh status as default rather than it's current value
2017-11-03 16:15:02 +01:00
moneromooo-monero
6cf3344605
Remove wallet dependency on p2p
2017-11-02 16:13:24 +00:00
Riccardo Spagni
32b46c594b
Merge pull request #2703
...
d0463312a46c1eed086b7db2
2017-11-01 11:24:54 +02:00
Riccardo Spagni
54463b33b3
Merge pull request #2723
...
69c37200
2017-10-31 20:38:38 +02:00
Riccardo Spagni
5ef9c69ef5
Merge pull request #2711
...
fab3b722
2017-10-31 20:35:41 +02:00
Riccardo Spagni
c97fbb0176
Merge pull request #2718
...
626e8078
2017-10-31 20:33:44 +02:00
Riccardo Spagni
3fe07603e4
Merge pull request #2705
...
44f14638
2017-10-31 20:33:19 +02:00
moneromooo-monero
9d6c6c5dec
wallet2: do not bother downloading block hashes below last checkpoint
2017-10-31 10:29:54 +00:00
Tim L
69c37200aa
RPC Add cross origin resource sharing support
2017-10-30 13:55:56 -04:00
Jaquee
a46c1eed8c
Wallet2: Don't throw when subaddress label doesn't exist
2017-10-29 15:26:22 +01:00
Jaquee
867b67c4fd
Wallet API: override update subdir when built from src
2017-10-29 15:17:31 +01:00
moneromooo-monero
626e80780b
wallet2: fix show_transfers missing multiple incoming outputs
2017-10-23 14:38:07 +01:00
moneromooo-monero
ca87cbd852
wallet2: fix subaddress fields serialization
...
When loading an older wallet cache, they wouldn't be initialized,
leading them to have random(ish) values, and so assigned to some
random subaddress.
2017-10-23 11:53:49 +01:00
Michał Sałaban
fab3b7221b
Add more specific RPC error codes
2017-10-23 04:27:02 +02:00
moneromooo-monero
44f1463867
wallet2: fix tx size estimator for large number of inputs
2017-10-22 19:46:07 +01:00
Jaquee
086b7db2c7
Wallet API: default values for account and subaddr index
2017-10-22 18:15:23 +02:00
rbrunner7
b370ef54b9
Wallet: Descriptions through new commands 'set_description', 'get_description'
2017-10-16 22:24:09 +02:00
binaryFate
b2d416f211
Distinguish "not enough money" and "not enough unlocked money"
...
Fix #1530
2017-10-16 15:14:09 +02:00
kenshi84
ac4018a7e6
wallet2: workaround for lightwallet before supporting subaddress (followup #2656 )
2017-10-16 12:03:09 +09:00
Vasil Dimov
4d35ad7603
Fix compiler warnings with Clang 6.0.0.
...
monero/src/cryptonote_protocol/block_queue.cpp:208:44: error:
suggest braces around initialization of subobject [-Werror,-Wmissing-braces]
static const boost::uuids::uuid uuid0 = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
{ }
monero/src/wallet/wallet_rpc_server.cpp:1895:43: error:
lambda capture 'wal' is not used [-Werror,-Wunused-lambda-capture]
tools::signal_handler::install([&wrpc, &wal](int) {
^
monero/src/cryptonote_protocol/cryptonote_protocol_handler.inl:1616:40: error:
lambda capture 'arg' is not used [-Werror,-Wunused-lambda-capture]
m_p2p->for_each_connection([this, &arg, &fluffy_arg, &exclude_context, &fullConnections...
^
monero/src/cryptonote_protocol/cryptonote_protocol_handler.inl:1616:46: error:
lambda capture 'fluffy_arg' is not used [-Werror,-Wunused-lambda-capture]
m_p2p->for_each_connection([this, &arg, &fluffy_arg, &exclude_context, &fullConnections...
^
monero/src/blockchain_utilities/blockchain_export.cpp:181:3: error:
bool literal returned from 'main' [-Werror,-Wmain]
CHECK_AND_ASSERT_MES(r, false, "Failed to initialize source blockchain storage");
^ ~~~~~
monero/contrib/epee/include/misc_log_ex.h:180:97: note:
expanded from macro 'CHECK_AND_ASSERT_MES'
...fail_ret_val, message) do{if(!(expr)) {LOG_ERROR(message); return fail_ret_val;};}while(0)
^ ~~~~~~~~~~~~
monero/src/blockchain_utilities/blockchain_export.cpp:195:3: error:
bool literal returned from 'main' [-Werror,-Wmain]
CHECK_AND_ASSERT_MES(r, false, "Failed to export blockchain raw data");
^ ~~~~~
monero/contrib/epee/include/misc_log_ex.h:180:97: note:
expanded from macro 'CHECK_AND_ASSERT_MES'
...fail_ret_val, message) do{if(!(expr)) {LOG_ERROR(message); return fail_ret_val;};}while(0)
^ ~~~~~~~~~~~~
2017-10-15 22:02:24 +03:00
Jaquee
3492de010b
fix lightwallet and subaddresses conflict
2017-10-15 19:19:40 +02:00
Riccardo Spagni
5c3275ddbe
Merge pull request #2596
...
06fb9bcf
2017-10-15 18:47:16 +02:00
Riccardo Spagni
71253c1dcd
Merge pull request #2592
...
dc19659d8b0068772183ade0
2017-10-15 18:39:13 +02:00
Riccardo Spagni
1280ba4f5b
Merge pull request #2589
...
8f0cea63
2017-10-15 18:38:46 +02:00
Riccardo Spagni
27ed7419bb
Merge pull request #2570
...
f139a6ca
2017-10-15 18:33:51 +02:00
Riccardo Spagni
c45f3ac4d9
Merge pull request #2568
...
7130cf0c
2017-10-15 18:32:09 +02:00
Riccardo Spagni
1c546e0d81
Merge pull request #2565
...
452d4fae
2017-10-15 18:27:08 +02:00
Riccardo Spagni
960886aa04
Merge pull request #2109
...
97c2e449d92618679442b043fc92293479207743dde5a1fcbba5cbed7a482f30ce61b8181197cb7143b5780432e2b0032e692fc0f44d156c288d3c752c6aad7eff7c30aae2a276cba13540befd773d888bfa6c2d76961ddc1cf940f2eec10137
2017-10-15 18:25:08 +02:00
Jaquee
97c2e449ce
wallet2+API: use separate callbacks for lightwallets
2017-10-15 17:58:28 +02:00
Jaquee
d92618675b
walletAPI: correct confirmations in txHistory for unsynced wallets
2017-10-15 17:58:28 +02:00
Jaquee
9442b04302
walletAPI: lightwallet exceptions
2017-10-15 17:57:45 +02:00
Jaquee
fc9229342d
walletAPI: add lightwallet login() and importWalletRequest()
2017-10-15 17:57:43 +02:00
Jaquee
79207743b8
walletAPI: init() lightwallet and SSL support
2017-10-15 17:56:35 +02:00
Jaquee
dde5a1fc36
walletAPI: add tx unlock_time
2017-10-15 17:54:17 +02:00
Jaquee
bba5cbed8f
wallet2: remove obsolete get_num_rct_outputs() call from create_transactions_2
2017-10-15 17:54:14 +02:00
Jaquee
7a482f302b
wallet2: create_transactions_2 lightwallet support
2017-10-15 17:51:20 +02:00
Jaquee
ce61b8189b
wallet2: get_outs lightwallet support
2017-10-15 17:50:03 +02:00
Jaquee
1197cb71e9
wallet2: commit_tx() lightwallet support
2017-10-15 17:48:45 +02:00
Jaquee
43b57804f8
wallet2: refactor is_tx_spendtime_unlocked()
2017-10-15 17:48:45 +02:00
Jaquee
32e2b0030e
wallet2: add lightwallet exceptions to common functions
2017-10-15 17:48:41 +02:00
Jaquee
2e692fc05a
wallet2: refresh() lightwallet support
2017-10-15 17:42:50 +02:00
Jaquee
f44d156cbd
my/openmonero API functions
2017-10-15 17:42:29 +02:00
Jaquee
288d3c75c3
wallet2: add remove_obsolete_pool_txs()
2017-10-15 17:39:54 +02:00
Jaquee
2c6aad7ea7
wallet2: add on_pool_tx_removed callback
2017-10-15 17:35:15 +02:00
Jaquee
ff7c30aadc
wallet2: light wallet member variables
2017-10-15 17:35:08 +02:00
Riccardo Spagni
d316b3d266
Merge pull request #2554
...
d74336d5
2017-10-15 17:32:30 +02:00
Jaquee
e2a276cbb5
wallet2: add ssl option to init()
2017-10-15 17:32:13 +02:00
moneromooo-monero
7130cf0c61
Add tools::on_startup, and warn about glibc 2.25 bug if found
...
https://sourceware.org/bugzilla/show_bug.cgi?id=21778
2017-10-14 09:12:28 +01:00
moneromooo-monero
06fb9bcfcc
wallet2: fix refresh height calc for new wallets
2017-10-07 11:21:11 +01:00
kenshi84
53ad5a0f42
Subaddresses
2017-10-07 13:06:21 +09:00
stoffu
d74336d5c9
wallet: encrypt (un)signed tx, also optionally save unencrypted raw tx hexstr
2017-10-07 12:45:32 +09:00
Michał Sałaban
2183ade0c4
Don't try to create wallet-dir when it's not given, don't crash if wallet-dir already exists.
2017-10-07 02:04:33 +02:00
Riccardo Spagni
09ccd07bbc
Merge pull request #2542
...
180a848c
2017-10-06 23:00:24 +04:00
Riccardo Spagni
fb7dcb6ec0
Merge pull request #2539
...
93ed9321
2017-10-06 22:57:20 +04:00
Riccardo Spagni
6cf36b4e96
Merge pull request #2530
...
cbc5508b
2017-10-06 22:54:19 +04:00
Riccardo Spagni
1c044b162c
Merge pull request #2529
...
bd937139
2017-10-06 22:53:28 +04:00
moneromooo-monero
8f0cea6355
add a command_line function to check for defaulted options
2017-10-06 10:56:18 +01:00
moneromooo-monero
f139a6cad0
wallet2: fix backlog being off by 1
...
We don't want to count "partly filled" blocks in this case
2017-10-03 11:49:46 +01:00
moneromooo-monero
452d4fae39
tests: fix hashchain unit tests
...
and relax the not-empty safety check to stay more intuitiuve
2017-10-03 00:51:53 +01:00
stoffu
bd9371395e
wallet2: error check for generate_key_image_helper, removed redundant wallet_generate_key_image_helper
2017-10-03 08:13:00 +09:00
stoffu
cbc5508b15
construct_tx_and_get_tx_key: return sorted sources for print_ring_memebrs to work properly
2017-10-03 08:12:28 +09:00
selsta
986d03d4b2
simplewallet: allow to set threshold before warning about tx backlog
2017-10-02 21:23:33 +02:00
Riccardo Spagni
737717c111
Merge pull request #2491
...
d5a9edf25c5b0fd0
2017-10-02 23:17:57 +04:00
moneromooo-monero
37c12119ab
wallet2: fix hash chain trimming when the inner chain becomes empty
...
It'd prevent further syncing. Recovery of empty hash chains is
automatic, but requires a running daemon
2017-10-02 12:52:22 +01:00
landergate
180a848cbe
wallet2: Missing underflow check on low heights
...
Lack of it results in `m_refresh_from_block_height` being < 0 (18446744...) on low heights, which blocks `process_new_blockchain_entry` and never process coins on heights less than blocks_per_month.
Follow-up to #2258
2017-09-27 14:17:48 +03:00
redfish
93ed932143
cmake: add libversion and libcheckpoints to libwallet_merged
...
Needed to link monero-core Qt wallet.
2017-09-27 00:57:02 -04:00
moneromooo-monero
36c3465b98
wallet2: do not keep block hashes below last checkpoint
...
This saves a lot of space and load/save time for wallet caches
2017-09-25 21:16:40 +01:00
moneromooo-monero
5d65a75b69
move checkpoints in a separate library
2017-09-25 21:16:26 +01:00
moneromooo-monero
2ec928badb
wallet2: simplify tx processing a bit
2017-09-25 18:35:51 +01:00
moneromooo-monero
740e6533a5
wallet2: factor some of the tx scanning code
2017-09-25 16:11:28 +01:00
Riccardo Spagni
32bbe62120
Merge pull request #2456
...
91def9a5
2017-09-25 16:54:08 +02:00
Riccardo Spagni
c2346c6c59
Merge pull request #2424
...
28b72b6e50a629b2fee15ef11399e26d50e0969854cc209a3e55099c7d0dde5eed4a335044434c8a92f2f6875475692ea7ba3de1b2763aceb5faac532e44d8f24230876b06c1e05711f71af5
2017-09-25 16:52:27 +02:00
Riccardo Spagni
5953724f69
Merge pull request #2443
...
ffe27127
2017-09-25 16:51:07 +02:00
Riccardo Spagni
b911130a46
Merge pull request #2442
...
e29282d2
2017-09-25 16:50:35 +02:00
moneromooo-monero
fee15ef1a9
wallet2: catch failure to parse address
...
CID 175297
2017-09-25 15:48:48 +01:00
moneromooo-monero
54cc209a5e
wallet_rpc_server: catch failure to create directory
...
CID 175281
2017-09-25 15:48:39 +01:00
moneromooo-monero
3e55099cb2
wallet_rpc_server: init m_vm to NULL in ctor
...
CID 175279
2017-09-25 15:48:36 +01:00
moneromooo-monero
7d0dde5eb5
wallet_args: remove redundant default value for --log-file
...
CID 175265
2017-09-25 15:48:33 +01:00
moneromooo-monero
ed4a33502d
wallet2: catch failure to save keys file
...
CID 161848
2017-09-25 15:48:30 +01:00
moneromooo-monero
44434c8a37
wallet2_api: check whether dynamic_cast returns NULL
...
CID 161844
2017-09-25 15:48:27 +01:00
moneromooo-monero
5475692ed5
wallet2_api: remove an unused, uninitialized, field
...
Silences CID 161874
2017-09-25 15:48:21 +01:00
moneromooo-monero
b2763ace06
wallet2_api: init error code to "no error" in the ctor
...
CID 161872
2017-09-25 15:48:16 +01:00
moneromooo-monero
2e44d8f23c
wallet_rpc_server: guard against exceptions
...
CID 175305
2017-09-25 15:48:10 +01:00
Riccardo Spagni
ce37967dd2
Merge pull request #2386
...
a15e85838fe5f609
2017-09-25 16:40:54 +02:00
Riccardo Spagni
216395d43e
Merge pull request #2379
...
9c83f806
2017-09-25 16:40:35 +02:00
Riccardo Spagni
ec0e144e90
Merge pull request #2377
...
b5cbdce8
2017-09-25 16:40:16 +02:00
Riccardo Spagni
40d213154b
Merge pull request #2289
...
6ee1116d
2017-09-25 16:38:14 +02:00
Riccardo Spagni
c6306e75e7
Merge pull request #2257
...
651baaec
2017-09-25 16:37:17 +02:00
