]> git.nothing2do.fr Git - diary-mobile.git/commit
Merge branch 'master' of github.com:Nothing2Do/diary-mobile-android
authorNorbert Moutarde <norbert.moutarde@nothing2do.eu>
Thu, 10 Apr 2014 13:33:36 +0000 (15:33 +0200)
committerNorbert Moutarde <norbert.moutarde@nothing2do.eu>
Thu, 10 Apr 2014 13:33:36 +0000 (15:33 +0200)
commit3cb355772e72ffce737834e73ace838cfdc802b6
treee1314b45dda62069057c5cfe522db006bba2a7d3
parentd15b2a9e8ae519c11c3747c427506422801805ba
parent7a8061ee5a09cb11b850a53d5d6982057b6cb38b
Merge branch 'master' of github.com:Nothing2Do/diary-mobile-android

Conflicts:
ui.sql
ui.sql