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
5c2dfe157b
Merge pull request #2771
...
e3e838d04877aca2
2017-11-15 11:22:56 +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
29cee4ec4f
Fix 383ff4f689
...
Missed a crypto::null_pkey in PR#2629
2017-11-14 20:36:21 +00:00
Howard Chu
b85e82bf6a
Fix e89994e98f
...
Missed an input_line() change
2017-11-14 20:34:32 +00:00
Howard Chu
95e784ad00
Fix 437421ce42
...
Missing an error argument for an exception
2017-11-14 20:29:05 +00:00
Riccardo Spagni
86a35eeed2
Merge pull request #2789
...
b0416f07
2017-11-14 22:17:07 +02:00
Riccardo Spagni
0c4df51bbb
Merge pull request #2765
...
fc85d7a9
2017-11-14 22:16:37 +02:00
anonimal
a3ea62f209
CMake: include RPC when building GUI deps
2017-11-14 19:45:58 +00:00
Riccardo Spagni
10a237783a
Merge pull request #2692
...
0f2c2d4c
2017-11-14 21:32:33 +02: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
922aaf4e2a
Merge pull request #2644
...
a17efcb0
2017-11-14 21:31:09 +02:00
Riccardo Spagni
41a8bf4f4c
Merge pull request #2636
...
ad03f778
2017-11-14 21:30:25 +02:00
Riccardo Spagni
5de492be40
Merge pull request #2629
...
383ff4f6
2017-11-14 21:29:49 +02:00
moneromooo-monero
0f2c2d4c34
rpc: remove obsolete busy core checks
2017-11-14 17:15:19 +00: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
a9e14a19dc
link against readline only for monerod and wallet-wallet-{rpc,cli}
2017-11-14 17:06:32 +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
ec5135e5b7
move input_line from command_line to simplewallet
...
It was only used there, and this removes one part of the common
dependency on libreadline
2017-11-14 17:06:23 +00:00
moneromooo-monero
082db75f28
move cryptonote command line options to cryptonote_core
...
Those have no reason to be in a generic module
2017-11-14 17:06:19 +00:00
Pavel Maryanov
a17efcb039
make this build on SunOS/Solaris
2017-11-14 17:03:48 +00:00
moneromooo-monero
ad03f77856
simplewallet: factor transfer related exception handling
...
This ensures they don't go out of sync when adding/changing them,
and makes the code easier to deal with.
2017-11-14 17:00:39 +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
stoffu
fc85d7a998
simplewallet: fix in show_transfer passing wrong arg to wallet2::get_payments etc
2017-11-15 00:25:17 +09: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
a2241e8151
Merge pull request #2753
...
fa514082
2017-11-14 15:54:33 +02:00
Riccardo Spagni
68d5952f6a
Merge pull request #2752
...
68c01782
2017-11-14 15:49:53 +02:00
Riccardo Spagni
95c34e17cd
Merge pull request #2750
...
424852a6
2017-11-14 15:49:15 +02:00
Riccardo Spagni
a2b427b1bf
Merge pull request #2749
...
f732e723
2017-11-14 15:35:47 +02:00
Riccardo Spagni
1e874186b3
Merge pull request #2747
...
37e1fd94
2017-11-14 15:32:29 +02:00
Riccardo Spagni
55603627c9
Merge pull request #2745
...
6cf33446
2017-11-14 15:31:40 +02:00
Riccardo Spagni
0d0ce8c21e
Merge pull request #2742
...
7c7d36726738753b
2017-11-14 15:30:03 +02:00
Riccardo Spagni
e0e6e375bb
Merge pull request #2738
...
4a17f0c2
2017-11-14 15:28:47 +02:00
Riccardo Spagni
e759c78a17
Merge pull request #2735
...
a524b750
2017-11-14 15:27:51 +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
Riccardo Spagni
8df6b010eb
Merge pull request #2696
...
937e7f8a
2017-11-14 15:13:44 +02:00
moneromooo-monero
2677ade502
simplewallet: forbid 0 ring size
...
It'd be interpreted as a huge one (~0 fake outs)
2017-11-14 13:12:42 +00: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
6172248acf
Merge pull request #2685
...
1ff638e9
2017-11-14 15:04:40 +02:00
Riccardo Spagni
f4fded6fcf
Merge pull request #2683
...
105425b7
2017-11-14 15:04:15 +02:00
Riccardo Spagni
f1ca1f35d1
Merge pull request #2682
...
8ddcf1e7
2017-11-14 15:03:15 +02:00
Riccardo Spagni
48ff10f77f
Merge pull request #2681
...
ec48e8d8523084bc
2017-11-14 15:02:55 +02:00
Riccardo Spagni
256a1d9ead
Merge pull request #2675
...
00cc1fdd
2017-11-14 15:02:14 +02:00
Riccardo Spagni
2ddb894607
Merge pull request #2661
...
ac4018a7#2656 ) (kenshi84)
2017-11-14 15:01:25 +02:00
Riccardo Spagni
474e02ccde
Merge pull request #2651
...
118a1bed
2017-11-14 15:00:39 +02:00
Riccardo Spagni
395025bb23
Merge pull request #2633
...
ad96c478
2017-11-14 14:56:07 +02:00
Riccardo Spagni
f26e7a84a6
Merge pull request #2620
...
6bd4dac6
2017-11-14 14:54:42 +02:00
Riccardo Spagni
9317c9c57e
Merge pull request #2617
...
7dbf76d0
2017-11-14 14:54:05 +02:00
Riccardo Spagni
fd0740e5e7
Merge pull request #2615
...
10013e94
2017-11-14 14:53:10 +02:00
Riccardo Spagni
3fff292dc1
Merge pull request #2509
...
ccf53a56
2017-11-14 14:50:03 +02:00
moneromooo-monero
43f27c7d43
core: warn when free disk space is low
2017-11-14 10:21:34 +00:00
binaryFate
da706b6102
Fix false GCC warning '‘*((void*)& subaddr_account +4)’ may be used unitialized'
2017-11-14 09:45:43 +01:00
stoffu
105425b7f6
simplewallet: reject invalid argument for boolean parameter
2017-11-14 16:33:17 +09:00
stoffu
a524b7508e
rpc: added miner_tx_hash to resp of getblock
2017-11-14 16:31:46 +09: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
binaryFate
b42ee213e8
Wallet: update ring size in outdated error msgs with set_default_ring_size
2017-11-13 09:53:18 +01:00
Vasil Dimov
47c0948ab0
Implement missing miner functions on FreeBSD
...
cryptonote::miner::get_system_times(): Fetch the system's total and
idle time using sysctl kern.cp_time.
cryptonote::miner::get_process_time(): Use the same implementation as
Linux and OSX, the times(3) function conforms to POSIX.1 and is
available on FreeBSD.
cryptonote::miner::on_battery_power(): Try to fetch the battery status
using sysctl hw.acpi.acline. If that fails (if ACPI is not enabled on
the system), then try querying /dev/apm.
2017-11-11 16:27:19 +02:00
Vasil Dimov
fdb5bd161d
Remove unused variables and fix typos in comments
2017-11-11 16:17:19 +02:00
moneromooo-monero
e3e838d0cf
kaccak: remove unused return value
2017-11-11 11:20:48 +00:00
moneromooo-monero
b0416f070e
checkpoints: add a testnet checkpoint at 1000000
...
Makes working on testnet a lot easier (much less I/O when loading
and saving wallets, and exercises the hashchain code before any
changes are merged)
2017-11-11 11:16:48 +00:00
binaryFate
416a793326
Print msg upon success for commands that were silent
2017-11-10 09:42:40 +01:00
Riccardo Spagni
af448d3883
Merge pull request #2694
...
11e0deef35340259
2017-11-09 18:22:25 +02:00
moneromooo-monero
2d1ccc1b88
mnemonics: support for arbitrary (if multiple of 4 bytes) length data
2017-11-09 10:58:10 +00:00
MaxXor
c957795bfa
fix output_stream_header memory leak
2017-11-08 19:59:09 +01:00
binaryFate
10013e9434
Protect node privacy by proper filtering in restricted-mode RPC answers
...
This patch allows to filter out sensitive information for queries that rely on the pool state, when running in restricted mode.
This filtering is only applied to data sent back to RPC queries. Results of inline commands typed locally in the daemon are not affected.
In practice, when running with `--restricted-rpc`:
* get_transaction_pool will list relayed transactions with the fields "last relayed time" and "received time" set to zero.
* get_transaction_pool will not list transaction that have do_not_relay set to true, and will not list key images that are used only for such transactions
* get_transaction_pool_hashes.bin will not list such transaction
* get_transaction_pool_stats will not count such transactions in any of the aggregated values that are computed
The implementation does not make filtering the default, so developers should be mindful of this if they add new RPC functionality.
Fixes #2590 .
2017-11-08 13:07:07 +01:00
Michał Sałaban
ffe5b857e1
Correct totals computation
2017-11-08 12:09:50 +01:00
Tim L
fa51408272
RPC: get_info add rpc_connections_count
2017-11-07 16:34:49 -05:00
moneromooo-monero
5d92c7ccf6
wallet2: typo fix in error message
2017-11-07 14:04:40 +00:00
moneromooo-monero
4877aca2b6
keccak: some paranoid "can't happen" checks
2017-11-07 14:02:37 +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
f960ef9454
Merge pull request #2595
...
8041b4e9
2017-11-06 01:55:15 +02:00
Riccardo Spagni
7452359d8f
Merge pull request #2591
...
93ad1f87Fix #2559 : more flexible print_tx daemon command (binaryFate)
2017-11-06 01:54:48 +02:00
Riccardo Spagni
32b083d8bd
Merge pull request #2546
...
b2d416f2
2017-11-06 01:53:43 +02:00
Riccardo Spagni
4022a0a57e
Merge pull request #2729
...
161401dd
2017-11-06 01:42:55 +02:00
stoffu
8041b4e901
wallet-cli: allow priority argument for sweep_all and donate
2017-11-04 12:11:04 +09: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
Riccardo Spagni
13a84caa22
Merge pull request #2662
...
88ebfd64e373a203
2017-11-03 11:58:06 +02:00
moneromooo-monero
68c0178220
updates: add a special case for "install-" build tags on windows
...
Those will have a ".exe" file extension, not .zip.
2017-11-03 09:45:08 +00:00
Leon Klingele
424852a627
Fix 'sweep_all' command when called with no args
...
Executing 'sweep_all' with no arguments segfaulted before.
2017-11-03 04:52:26 +01:00
Leon Klingele
f732e723b7
Disguise password length in prompt
2017-11-03 04:04:54 +01:00
moneromooo-monero
37e1fd94d5
simplewallet: mark the active account in print_accounts
2017-11-02 23:46:12 +00:00
Howard Chu
7c7d36725a
Increase LMDB maxreaders if large number of threads in use
2017-11-02 16:33:48 +00:00
Howard Chu
6738753b30
Use max_concurrency as-is
...
Don't try to 2nd guess user
2017-11-02 16:33:48 +00: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
1648c1d466
Merge pull request #2659
...
52c13810
2017-10-31 20:42:48 +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
00270dd279
Merge pull request #2737
...
935f7462
2017-10-31 20:34:22 +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
Riccardo Spagni
75ad92c82c
Merge pull request #2702
...
f946bb7b#2699 ) which leads to a crash in monerod (ston1th)
2017-10-31 20:31:42 +02:00
Riccardo Spagni
784f7b07f0
Merge pull request #2660
...
4dd05a2f
2017-10-31 20:28:00 +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
moneromooo-monero
4a17f0c2c7
rpc: add performance timers
...
Enable with perf:DEBUG
2017-10-30 09:39:36 +00:00
moneromooo-monero
935f746249
blockchain: do not lock the blockchain lock for simple DB getters
...
It is safe in those cases, though might return slightly out of date
information if another thread is busy modifying the blockchain,
but it avoids potentially lengthy delays just to get things like
the current blockchain height.
2017-10-30 08:23:40 +00: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
Lee Clagett
161401ddca
Fix JSON-RPC response object over ZMQ
2017-10-26 17:25:14 -04:00
ston1th
f946bb7be6
fixed an LMDB issue on OpenBSD ( #2699 ) which leads to a crash in monerod
2017-10-26 17:16:06 +02: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
moneromooo-monero
1ff638e927
protocol: drop connections which don't handshake after some time
2017-10-22 19:45:30 +01:00
Jaquee
086b7db2c7
Wallet API: default values for account and subaddr index
2017-10-22 18:15:23 +02:00
moneromooo-monero
937e7f8aa6
Initialize openssl on startup
2017-10-21 10:17:18 +01:00
redfish
11e0deef31
cmake: add dep of version lib on version.cpp
...
Also, move cmake source files into cmake/ to keep them together.
2017-10-20 22:07:34 -04:00
moneromooo-monero
8ddcf1e714
simplewallet: remove XMR mentions
...
They are actually wrong if the wallet is setup in a different
denomination, and it's incursion of extrinsic lingo where monero
fits perfectly in the first place.
2017-10-19 13:10:29 +01:00
moneromooo-monero
ec48e8d81d
core: do not forbid txes without destination
...
This was spuriously forbidden in the recent subaddress patch,
which isn't inherently incompatible with these.
2017-10-19 09:11:12 +01:00
moneromooo-monero
523084bc79
core: don't add empty additional pub keys field to extra
...
Saves a couple bytes per tx
2017-10-19 09:11:10 +01:00
kenshi84
00cc1fdd22
subaddress: remove unneeded scalarmultBase
2017-10-18 08:46:00 +09:00
kenshi84
88ebfd646a
core_tests: fix for subaddress patch
2017-10-17 22:29:01 +09: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
kenshi84
4dd05a2f9b
subaddress: change prefix so that it starts with 8
2017-10-16 10:35:59 +09:00
Bertrand Jacquin
52c1381049
blockchain_utilities: Add monero-blockchain-{ex,im}port binaries to
...
default install targets
Binaries available to download on https://getmonero.org/downloads/ as
embedding monerod, monero-wallet-{cli,rpc} and
monero-blockchain-{ex,im}port.
This change synchronise download results with a manual build from
source
2017-10-15 22:19:38 +01: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
Riccardo Spagni
97c11caf07
Merge pull request #2656
...
3492de01329f149e
2017-10-15 19:32:18 +02:00
Jaquee
3492de010b
fix lightwallet and subaddresses conflict
2017-10-15 19:19:40 +02:00
Jaquee
329f149e95
remove reference to cryptonote::null_hash
2017-10-15 19:19:40 +02:00
Riccardo Spagni
b293ad9a1a
Merge pull request #2640
...
22b51e065db433b3
2017-10-15 18:59:45 +02:00
Riccardo Spagni
344c01c712
Merge pull request #2638
...
529a6a4a
2017-10-15 18:58:57 +02:00
Riccardo Spagni
845afb5191
Merge pull request #2613
...
2051f89f
2017-10-15 18:58:31 +02:00
Riccardo Spagni
73f0c16743
Merge pull request #2606
...
4090e8c6
2017-10-15 18:51:11 +02:00
Riccardo Spagni
d5ab55b8d7
Merge pull request #2604
...
0a872798
2017-10-15 18:50:32 +02:00
Riccardo Spagni
f1bee553b1
Merge pull request #2602
...
bc1b9333
2017-10-15 18:49:48 +02:00
Riccardo Spagni
f484b162db
Merge pull request #2599
...
b776c725
2017-10-15 18:48:19 +02:00
Riccardo Spagni
e50bf5f811
Merge pull request #2597
...
c4136134
2017-10-15 18:47:43 +02:00
