Merge lp:~matzipan/pantheon-mail/migrations-fix into lp:~elementary-apps/pantheon-mail/trunk

[Zisu Andrei]

Moved sqlite migration files where local build expects them to be

[Danielle Foré (danrabbit)]

Hey thanks for you branch! Please use "bzr mv" to relocate files and folders instead. This makes the diff smaller and easier to verify

review: Needs Fixing

[Zisu Andrei (matzipan)]

I noticed that. I didn't know bazaar has that functionality. I'm too used to git :(

[lp:~matzipan/pantheon-mail/migrations-fix]

1979. By Zisu Andrei on 2016-02-23

Moved sqlite migration files where local build expects them to be

[Zisu Andrei (matzipan)]

Fixed.

[Danielle Foré (danrabbit)]

Works for me, thanks!

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-02-17 01:21:06 +0000
+++ CMakeLists.txt	2016-02-23 17:03:47 +0000
@@ -98,6 +98,5 @@
 
 add_subdirectory(data)
 add_subdirectory(po)
-add_subdirectory(sql)
 add_subdirectory(src)
 

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2016-02-17 18:59:49 +0000
+++ data/CMakeLists.txt	2016-02-23 17:03:47 +0000
@@ -37,3 +37,5 @@
 
 add_subdirectory(theming)
 add_subdirectory(ui)
+add_subdirectory(sql)
+

=== renamed directory 'sql' => 'data/sql'