diff options
| author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2015-08-11 17:17:21 +0200 |
|---|---|---|
| committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2015-08-11 17:17:21 +0200 |
| commit | 5223abda2bcab0b33a67ff7817034954ec072095 (patch) | |
| tree | 2a33a3698dc568878061f35c01bd6a5cb3599be2 /src/backend/taler-merchant-dbinit | |
| parent | aa3058cbd815f1badf0357f976232c0d17c1e614 (diff) | |
| parent | f9c3548be9788cf0ba47dcde88fa4e08fb911093 (diff) | |
| download | merchant-5223abda2bcab0b33a67ff7817034954ec072095.tar.gz merchant-5223abda2bcab0b33a67ff7817034954ec072095.tar.bz2 merchant-5223abda2bcab0b33a67ff7817034954ec072095.zip | |
Merge branch 'light'
Conflicts:
src/backend/Makefile.am
Diffstat (limited to 'src/backend/taler-merchant-dbinit')
| -rwxr-xr-x | src/backend/taler-merchant-dbinit | bin | 35040 -> 0 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/src/backend/taler-merchant-dbinit b/src/backend/taler-merchant-dbinit Binary files differdeleted file mode 100755 index b737366c..00000000 --- a/src/backend/taler-merchant-dbinit +++ /dev/null |