aboutsummaryrefslogtreecommitdiffstats
path: root/bitbake/lib/toaster/orm/migrations/0007_merge.py
AgeCommit message (Expand)Author
2016-03-11toaster: fix conflicting migrationsed/toaster/build-cancelEd Bartosh