Riccardo Spagni
47618c2710
Merge pull request #923
...
8312887
2016-07-23 09:20:18 +02:00
Riccardo Spagni
07f974a499
Merge pull request #916
...
b89b963
2016-07-23 09:19:39 +02:00
Riccardo Spagni
b582764bd6
Merge pull request #915
...
d7597c56d32a3d193d25110c06dd9d2cb4fd27b883083380c00ed12b
2016-07-23 09:17:21 +02:00
Riccardo Spagni
90f2e19d51
Merge pull request #910
...
080a606
2016-07-23 09:13:15 +02:00
moneromooo-monero
83128877e0
simplewallet: suggest removing cache when loading fails
2016-07-22 17:31:52 +01:00
moneromooo-monero
b89b96394a
wallet: add unconfirmed incoming txes from the txpool
...
Shown in show_transfers simplewallet command, and get_transfers
RPC command, if req.pool is true.
2016-07-20 19:14:44 +01:00
moneromooo-monero
080a60610f
simplewallet: revert to foreground refresh at startup
...
Background refresh is confusing to users at startup.
2016-07-20 19:09:32 +01:00
Riccardo Spagni
38e5156392
Merge pull request #914
...
87b1153
2016-07-20 14:29:33 +02:00
Riccardo Spagni
8e143fcf1d
Merge pull request #911
...
d7b681c
2016-07-20 14:01:27 +02:00
Riccardo Spagni
77015e8132
Merge pull request #904
...
f07f12019349d7f3e09f3f4b35aefa85cd84dce26b
2016-07-20 13:56:59 +02:00
Riccardo Spagni
fc3e135b83
Merge pull request #902
...
014f3a0
2016-07-20 13:55:59 +02:00
Riccardo Spagni
b1bec02ce5
Merge pull request #900
...
78cc10f34ecfdb
2016-07-20 13:53:25 +02:00
Riccardo Spagni
07f1d4e04d
Merge pull request #899
...
a95a2cb
2016-07-20 13:52:54 +02:00
Riccardo Spagni
992b6cce06
Merge pull request #897
...
ce6b831
2016-07-20 13:52:27 +02:00
moneromooo-monero
89d9f382a0
wallet: add command and RPC to sign/verify data
...
Signing is done using the spend key, since the view key may
be shared. This could be extended later, to let the user choose
which key (even a per tx key).
simplewallet's sign/verify API uses a file. The RPC uses a
string (simplewallet can't easily do strings since commands
receive a tokenized set of arguments).
2016-07-19 20:39:03 +01:00
Ilya Kitaev
d7597c5961
refreshing wallet even if error happened
2016-07-18 23:03:09 +03:00
Ilya Kitaev
6d32a3d16b
wallet_api: async init, Wallet::connected status, log level
2016-07-18 23:03:09 +03:00
Ilya Kitaev
193d251360
libwallet_api cmake: conditionally creating libwallet_merged2 only for
...
STATIC build
2016-07-18 23:03:09 +03:00
Ilya Kitaev
10c06ddac7
wallet_api: segfault on refresh fixed
2016-07-18 23:03:09 +03:00
Ilya Kitaev
9d2cb4f36c
WalletListener functionality
2016-07-18 23:02:47 +03:00
Ilya Kitaev
d27b883b2d
hack to successfull linking for MSYS2
2016-07-18 23:02:47 +03:00
Ilya Kitaev
083380cb8f
Transaction fee multiplier aka priority integraged
2016-07-18 23:02:18 +03:00
Ilya Kitaev
00ed12bd6c
Wallet::paymentIdValid
2016-07-18 23:02:18 +03:00
moneromooo-monero
87b1153f37
wallet2_api: use uint64_t for amounts
2016-07-17 09:33:31 +01:00
moneromooo-monero
d7b681cd65
remove hf_starting_height db
...
It's not really needed, it used to be an optimization for when
that code was not using the db and needed to recalculate things
fast on startup.
2016-07-13 21:38:34 +01:00
redfish
fa85cd845f
common: stack trace: make clang happy with func ptrs
...
Tested that it builds with:
gcc 6.1.1, STATIC=OFF,i686
gcc 6.1.1, STATIC=OFF,armv7h
clang 3.8, STATIC=OFF,i686
clang 3.8, STATIC=OFF,armv7h
gcc 6.1.1, STATIC=ON,i686
clang 3.8, STATIC=ON,i686
Also tested that stack trace is generated fine on exception on:
i686, gcc 6.1.1, STATIC=OFF
(didn't bother testing all the other platforms/configs)
This should fix the build problem on OSX (#871 , #901 ), but
I don't have OSX, so I could only test Clang on Linux.
2016-07-10 21:26:11 -04:00
moneromooo-monero
014f3a0d39
Add a daemon RPC version, and make simplewallet check it
...
If the version is different, simplewallet will refuse to use that
daemon, unless --allow-mismatched-daemon-version is used.
2016-07-10 16:49:40 +01:00
moneromooo-monero
78cc10f3fa
daemon: fix ban seconds being misinterpreted as absolute
...
Absolute to relative conversion is already done by the callee.
2016-07-10 15:13:53 +01:00
moneromooo-monero
34ecfdbf15
rpc: fix get_bans and set_bans RPC names, they were missing a _
2016-07-10 15:10:51 +01:00
moneromooo-monero
a95a2cbc4d
wallet_rpc_server: add payment id from integrated addresses to extra
2016-07-10 13:46:18 +01:00
redfish
ce6b83128e
daemonizer: posix: keep parent's working dir and umask
...
Keep the working directory (and umask) inherited from
the parent. Otherwise, it's impossible to control
the working directory of the daemon (from systemd, for
example).
Furthermoer, bitmonerod attempts to create logging directories and files
*in current working directory*. This fails due to permission denied and
generates a (caught, nonfatal) exception. Below is the strace with this
patch applied (so, no `chdir("/")`), showing successful opens at `log/`
relative path. Without this patch they fail (sorry, didn't save the
trace).
```
28911 getcwd("/.../bitmonero", 128) = 25
28911 stat64("/var/lib/bitmonero/.bitmonero", {st_mode=S_IFDIR|0755, st_size=4096, ...}) = 0
28911 stat64("/etc/bitmonerod.conf", {st_mode=S_IFREG|0644, st_size=244, ...}) = 0
28911 open("/etc/bitmonerod.conf", O_RDONLY|O_LARGEFILE) = 3
28911 open("/var/log/bitmonero/bitmonero.log", O_WRONLY|O_CREAT|O_APPEND|O_LARGEFILE, 0666) = 3
28911 stat64("log", {st_mode=S_IFDIR|0700, st_size=4096, ...}) = 0
28911 stat64("log/dbg", {st_mode=S_IFDIR|0700, st_size=4096, ...}) = 0
28911 open("log/dbg/main.log", O_WRONLY|O_CREAT|O_TRUNC|O_LARGEFILE, 0666) = 4
```
The reasoning of chdir("/") in order to prevent the daemon from holding
a filesystem in busy state is not compelling at all: the choice of
working directory for the daemon is the user's business not the
daemon's.
2016-07-09 20:16:44 -04:00
moneromooo-monero
a0bf85d09d
wallet2_api: make this build (smatch needs .str() for /=)
2016-07-07 22:42:59 +01:00
Riccardo Spagni
18fa01c092
Merge pull request #884
...
c2ad9ca
2016-07-06 18:20:17 +02:00
Riccardo Spagni
1088ed862b
Merge pull request #883
...
459ec60
2016-07-06 18:19:40 +02:00
Riccardo Spagni
0b65717a5d
Merge pull request #882
...
f11191a
2016-07-06 18:17:08 +02:00
Riccardo Spagni
00fd89a36d
Merge pull request #879
...
6b08001
2016-07-06 18:15:36 +02:00
Riccardo Spagni
3923cbddaf
Merge pull request #878
...
945c272
2016-07-06 18:14:34 +02:00
Riccardo Spagni
628f57b212
Merge pull request #873
...
d718960
2016-07-06 18:12:03 +02:00
moneromooo-monero
c2ad9caf01
allow peers without port
...
The default port is then used
2016-07-03 12:51:12 +01:00
moneromooo-monero
459ec6040e
daemon: print exception errors when failing to parse config file
...
When an exception happens while reading the config file, we need
to print the error, as the logging system isn't initialized yet,
so the generic catch will not print anything.
2016-06-30 22:15:40 +01:00
moneromooo-monero
f11191a818
rpc: restrict number of fake outs requested in restricted rpc mode
2016-06-29 20:43:14 +01:00
Ilya Kitaev
beb6d9200d
CMake: GPL 'libutils' script removed
2016-06-24 14:49:23 +03:00
Ilya Kitaev
ab61ba0c9b
Merge branch 'master' of https://github.com/mbg033/bitmonero
2016-06-23 16:23:09 +03:00
Ilya Kitaev
d60864785f
WalletManager::findWallets: searching by "keys" files instead of
...
"address.txt" files
2016-06-23 16:01:41 +03:00
Ilya Kitaev
ca61153003
Wallet: payment id and integrated address
2016-06-23 16:01:41 +03:00
Ilya Kitaev
23cbf6fd97
PendingTransactionImpl: pointer->reference
2016-06-23 16:01:41 +03:00
Ilya Kitaev
c1d9e7cd2a
commented regex
2016-06-23 16:01:41 +03:00
Ilya Kitaev
563baf1b68
Typo fixed
2016-06-23 16:01:41 +03:00
Ilya Kitaev
2efec04f74
Wallet::createTransaction: added mixin_count param
2016-06-23 16:01:41 +03:00
Ilya Kitaev
85a632244e
double/string to monero integer convertion methods
2016-06-23 16:01:41 +03:00
Ilya Kitaev
e7d8f2a085
wallet::default_mixin exposed to public interface as
...
Wallet::setDefaultMixin, Wallet::defaultMixin;
wallet::create_transaction_2 used in Wallet::createTransaction
2016-06-23 16:01:41 +03:00
Ilya Kitaev
a5374897f8
Wallet::filename, Wallet::keysFilename, tests for move wallet
2016-06-23 16:01:41 +03:00
Ilya Kitaev
a1eddcd693
removed unused "using"
2016-06-23 16:01:41 +03:00
Ilya Kitaev
8390bfa770
Wallet API : WalletManager::findWallets() added
2016-06-23 16:01:41 +03:00
Ilya Kitaev
dbc0b039b4
installing wallet_api header
2016-06-23 16:01:33 +03:00
Ilya Kitaev
191cb594de
all wallet dependencies merged to single static lib
2016-06-23 16:01:33 +03:00
Ilya Kitaev
64348a2d11
WalletListener::moneySpent test
2016-06-23 16:01:33 +03:00
Ilya Kitaev
060bb62e29
WalletListener::moneySpent(), WalletListener::moneyReceived()
2016-06-23 16:01:33 +03:00
Ilya Kitaev
214014c048
i_wallet_callback: virtual dtor
2016-06-23 16:01:33 +03:00
Ilya Kitaev
374577018d
started WalletListener
2016-06-23 16:01:33 +03:00
Ilya Kitaev
e6fdd5dd10
TransactionHistory continued
2016-06-23 16:01:26 +03:00
Ilya Kitaev
3dd4b4ccf9
merged with upstream
2016-06-23 15:50:40 +03:00
Ilya Kitaev
d500272fa8
Wallet API : transaction history in progress
2016-06-23 15:50:33 +03:00
Ilya Kitaev
663ed04eb8
transaction history api in progress
2016-06-23 15:50:17 +03:00
Ilya Kitaev
12345d382c
api implementation splitted over separate files
2016-06-23 15:50:17 +03:00
Ilya Kitaev
60508e6bae
TransactionInfo / TransactionHistory APIs design
2016-06-23 15:50:17 +03:00
Ilya Kitaev
951f3b5d83
Wallet::createTransaction API introduced
...
Transaction API continued
TODOs for Transaction/Transfer interface
2016-06-23 15:49:54 +03:00
Ilya Kitaev
7c51227f88
Wallet::transfer in progress
2016-06-23 15:49:36 +03:00
Ilya Kitaev
e04c67ac4c
Wallet::refresh + tests
2016-06-23 15:49:36 +03:00
Ilya Kitaev
9cdf0b7d7f
"testnet" is default parameter
2016-06-23 15:49:36 +03:00
Ilya Kitaev
caf0e02787
testnet option, Wallet::balance(), Wallet::unlockedBalance()
2016-06-23 15:49:22 +03:00
Ilya Kitaev
8df820b301
- testnet option added to api;
2016-06-23 15:49:07 +03:00
Ilya Kitaev
94eaeb50b2
wallet2::store() implemented within wallet2::store_to
2016-06-23 15:40:48 +03:00
moneromooo-monero
6b08001f9e
simplewallet: mention the background refresh thread when starting
...
It should be less confusing for people who're used to the foreground
refresh from earlier versions.
2016-06-22 23:05:50 +01:00
moneromooo-monero
945c272f6c
wallet: add a fee multiplier
...
Fee can now be multiplied by 2 or 3, if users want to give
priority to their transactions. There are only three levels
to avoid too much fingerprinting. Default is 1 (minimum fee).
The default multiplier can be set by "set fee-multiplier X".
2016-06-22 22:21:30 +01:00
Ilya Kitaev
4e5521d87d
PendingTransactionImpl: pointer->reference
2016-06-22 15:50:59 +03:00
Ilya Kitaev
7b7cf21644
commented regex
2016-06-22 15:06:19 +03:00
Ilya Kitaev
eec0f57d60
Typo fixed
2016-06-22 14:37:53 +03:00
luigi1111
d7189600ae
remove POSIX_C_SOURCE and remove dlfcn.h for static builds
...
The former was a faulty "fix" for gmtime_r not existing on Windows. The latter is needed only for dynamic builds, and is not included with msys2, which ends up fine because Windows is only built static at this time.
2016-06-21 11:16:25 -05:00
Riccardo Spagni
de91bb75a1
Merge pull request #870
...
57dce80
2016-06-21 09:32:32 +02:00
Riccardo Spagni
8c34cca0f0
Merge pull request #867
...
f0b85c1
2016-06-21 09:31:50 +02:00
Riccardo Spagni
03477063ba
Merge pull request #868
...
15c2b69f72388c
2016-06-21 09:30:56 +02:00
luigi1111
57dce8083a
gmtime for Windows
...
gmtime_r is not available in Windows, use gmtime_s instead. Also change shorthand codes (also not working in Windows).
2016-06-20 18:14:12 -05:00
Ilya Kitaev
f1c4a376af
Wallet::createTransaction: added mixin_count param
2016-06-20 22:56:30 +03:00
moneromooo-monero
15c2b69db7
common: fix build without libunwind
2016-06-20 19:23:32 +01:00
moneromooo-monero
f0b85c1631
simplewallet: add a status command
...
It matches the daemon, and should allow people who're suspicious
of the background refresh to know they're synced.
2016-06-20 19:11:10 +01:00
Riccardo Spagni
21b3a1b43c
Merge pull request #863
...
0c6e9e4
2016-06-19 21:52:35 +02:00
Riccardo Spagni
2072c642d1
Merge pull request #862
...
5dc09f2f8213c0
2016-06-19 21:51:32 +02:00
Riccardo Spagni
551d44a989
Merge pull request #856
...
c5f00bc2470b2077d8fc3
2016-06-19 21:30:20 +02:00
Riccardo Spagni
ba61f37f9c
Merge pull request #846
...
de030d9c2d7300689874121dbc9570f36341a7772f6462a3a
2016-06-19 21:25:52 +02:00
Riccardo Spagni
e97d96ccfb
Merge pull request #775
...
e409e59ef4ff42
2016-06-19 21:14:11 +02:00
moneromooo-monero
5dc09f2666
wallet_rpc_server: fix some string values being returned between <>
2016-06-19 17:52:46 +01:00
Ilya Kitaev
3318addafa
double/string to monero integer convertion methods
2016-06-16 16:42:33 +03:00
moneromooo-monero
0c6e9e4ddd
rpc: fix getblock RPC sending blob as binary, not hex dump
2016-06-10 17:48:19 +01:00
Ilya Kitaev
3ac20a46b3
wallet::default_mixin exposed to public interface as
...
Wallet::setDefaultMixin, Wallet::defaultMixin;
wallet::create_transaction_2 used in Wallet::createTransaction
2016-06-10 13:52:10 +03:00
Ilya Kitaev
c554055ce4
Wallet::filename, Wallet::keysFilename, tests for move wallet
2016-06-10 12:51:09 +03:00
moneromooo-monero
c5f00bc751
cn_deserialize: add minergate data
2016-06-06 18:51:36 +01:00
moneromooo-monero
2470b20029
cn_deserialize: print extra nonce as hex data
2016-06-06 18:51:10 +01:00
blashyrkh
77d8fc3344
tx_extra: parse new chunk added by minergate
...
Patch from blashyrkh on forum.getmonero.org:
https://forum.getmonero.org/5/support/2530/simplewallet-returns-invalid-paymentid
2016-06-06 18:29:16 +01:00
Ilya Kitaev
8f9d98b3e0
removed unused "using"
2016-06-03 16:56:13 +03:00
Ilya Kitaev
2facbe77e4
Wallet API : WalletManager::findWallets() added
2016-06-03 14:52:58 +03:00
Ilya Kitaev
bc4584c1ff
Merge remote-tracking branch 'upstream/master'
2016-05-27 11:33:08 +03:00
Ilya Kitaev
4327548915
installing wallet_api header
2016-05-27 10:58:07 +03:00
Ilya Kitaev
d43ad22595
all wallet dependencies merged to single static lib
2016-05-27 10:00:01 +03:00
redfish
95be58ef0e
crypto: slow-hash: disable mul implemented in asm for ARM
...
The implementation of mul in asm breaks 'slow-hash' test when built with
GCC 6.1.1. Disable this implementation in favor of plain C until it is
fixed.
2016-05-25 15:53:29 -04:00
redfish
68987416ad
src: p2p: add exception spec to throwing destructors
...
The destructors get a noexcept(true) spec by default, but these
destructors in fact throw exceptions. An alternative fix might be to not
throw (most if not all of these throws are non-essential
error-reporting/logging).
2016-05-18 01:02:21 -04:00
redfish
21dbc95b47
crypto: slow-hash: fix misleading indent
...
GCC warned about this one.
2016-05-18 01:02:17 -04:00
redfish
70f363401b
crypto: slow-hash: remove unused hash list for ARM
...
This list is already defined within the function. The
removed definition was shadowed.
2016-05-18 01:02:13 -04:00
redfish
1a7772fbae
crypto: oaes_lib: remove unused _NR array
2016-05-18 01:02:07 -04:00
redfish
6462a3a6db
crypto: fix compile error: use named type in sizeof
...
Btw, the warning 4200 remains disabled, but it did not get triggered
(GCC 6.1.1, ARM). But, perhaps a better way than disabling
the warning would be to do what is suggested here:
http://stackoverflow.com/questions/3350852/how-to-correctly-fix-zero-sized-array-in-struct-union-warning-c4200-without%3E
2016-05-18 01:01:58 -04:00
Riccardo Spagni
a837c9cb0f
Merge pull request #842
...
d539be3
2016-05-17 19:09:57 +02:00
Riccardo Spagni
f03def87ad
Merge pull request #840
...
1c0bffb9f8bc49
2016-05-17 19:09:11 +02:00
Riccardo Spagni
e54e4d96a4
Merge pull request #831
...
9ef8c7ba6e717e3eff37f7a66387d6bce4b
2016-05-17 19:07:28 +02:00
Riccardo Spagni
ae205020f6
Merge pull request #827
...
f1e70d1cebb97c590c439687855d2fb00c019fe8ae3ef
2016-05-17 19:04:41 +02:00
osensei
1c0bffb5f0
Restrict also 'get_connections' and 'getbans' APIs.
2016-05-16 08:34:15 -03:00
Ilya Kitaev
40087a745f
WalletListener::moneySpent test
2016-05-16 13:11:44 +03:00
moneromooo-monero
d539be3359
crypto: make clear generate_random_bytes is not thread safe
...
And add a thread safe version to encourage proper use
2016-05-15 00:05:59 +01:00
osensei
9f8bc4946b
Don't allow 'flush_txpool' and 'setbans' JSON_RPC methods when running in restricted mode.
2016-05-14 03:06:04 -03:00
Ilya Kitaev
27d86b73c6
WalletListener::moneySpent(), WalletListener::moneyReceived()
2016-05-13 16:25:31 +03:00
Ilya Kitaev
ff52c67aa9
i_wallet_callback: virtual dtor
2016-05-13 12:59:29 +03:00
Ilya Kitaev
2d799097ca
Merge remote-tracking branch 'upstream/master'
2016-05-12 15:14:30 +03:00
Ilya Kitaev
5dbd2b8fc3
started WalletListener
2016-05-05 22:24:00 +03:00
Ilya Kitaev
71131a84ea
TransactionHistory continued
2016-05-05 21:30:25 +03:00
moneromooo-monero
9ef8c7b694
tests: fix tests broken by the removal of the block reward accumulation loop
...
The tests for rejection of unmixable outputs in v2 are commented out,
as there are no unmixable outputs created anymore. This should be
restored at some point.
2016-05-01 20:59:41 +01:00
moneromooo-monero
a6e717ed30
cn_deserialize: deserialize tx_extra too
2016-05-01 11:42:48 +01:00
moneromooo-monero
d6bce4be36
core: move tx_extra parsing errors to log level 1
...
They're not fatal, though indicate something wrong
2016-05-01 11:35:06 +01:00
Riccardo Spagni
30dce45643
Merge branch 'performance' of https://github.com/LMDB/bitmonero
2016-04-29 21:41:43 +02:00
Howard Chu
f1e70d15ca
Only log 1/N skipped blocks
2016-04-29 16:50:51 +01:00
Howard Chu
cebb97c913
Move refresh height to keys file from cache file
2016-04-29 15:33:28 +01:00
Howard Chu
590c43988c
Make fast_refresh interruptible
2016-04-29 15:33:28 +01:00
Howard Chu
687855d658
Set refresh height earlier
...
Do it before the generate() call so the value actually gets stored.
2016-04-29 15:33:28 +01:00
Ilya Kitaev
93119344ec
TransactionHistory continued
2016-04-29 16:26:14 +03:00
Riccardo Spagni
8b0d22a2aa
Merge pull request #826
...
76c6bf1
2016-04-29 10:44:59 +02:00
Riccardo Spagni
5b734c2a3a
Merge pull request #825
...
513a658
2016-04-29 10:43:48 +02:00
Howard Chu
2fb00c0666
Fix 19fe8ae3ef
...
Don't prompt for restore-height on generate-new-wallet
2016-04-29 04:51:02 +01:00
moneromooo-monero
e409e59d29
Print stack trace on exceptions
...
if libunwind is found.
Useful for debugging logs.
2016-04-28 23:34:51 +01:00
moneromooo-monero
76c6bf1875
simplewallet: display all settings on set with no arguments
2016-04-28 22:09:49 +01:00
moneromooo-monero
513a658c87
add a --max-concurrency flag
...
It sets the max number of threads to use for a parallel job.
This is different that the number of total threads, since monero
binaries typically start a lot of them.
2016-04-28 20:33:59 +01:00
moneromooo-monero
09dddf281a
wallet: add a filter_by_height field to get_transfers
...
It allows a simple get_transfers (with default 0 min_height and
max_height) to return all transactions, instead of the unexpected
set of txes in block 0, which is probably none at all.
2016-04-27 23:43:39 +01:00
Riccardo Spagni
bdb93cbf3d
Merge pull request #823
...
a687e6e
2016-04-27 09:18:28 +02:00
Riccardo Spagni
29b2cfa3d9
Merge pull request #822
...
48ab3f9
2016-04-27 09:15:15 +02:00
moneromooo-monero
a687e6e592
simplewallet: fix pending transfers fee display in show_transfers
2016-04-26 22:42:26 +01:00
moneromooo-monero
d7bb1752eb
simplewallet: more threading fixes
2016-04-26 22:40:57 +01:00
moneromooo-monero
48ab3f93ff
wallet: add get_transfers rpc call
...
Allows getting in, out, pending, and failed transfers, similarly
to the show_transfers command.
2016-04-26 22:39:52 +01:00
moneromooo-monero
7baed9bd89
wallet: allow attaching notes to txids
2016-04-26 19:07:33 +01:00
moneromooo-monero
ce6f8a6324
wallet: add GMT timestamps to transfers/payments
2016-04-26 19:07:25 +01:00
Riccardo Spagni
3d984854a6
Merge pull request #819
...
31587bd
2016-04-26 18:11:04 +02:00
Riccardo Spagni
cde9dce9c4
Merge pull request #817
...
4b1c0d6
2016-04-26 18:08:59 +02:00
Riccardo Spagni
714dcc2866
Merge pull request #815
...
b0850a9
2016-04-26 18:08:09 +02:00
Riccardo Spagni
7098ad6804
Merge pull request #814
...
68cbe154b325bd
2016-04-26 18:04:00 +02:00
