diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-06-03 22:59:23 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-06-03 22:59:23 +0200 |
| commit | add9f73b4b2f2c1c82548b89ab30f37fdf9ae9c2 (patch) | |
| tree | 41bcb27d173e55ca3d8815f9e82be932c4e18c0a | |
| parent | 5e22a801d587761a58b0ea1f13d61ca47fd11352 (diff) | |
| parent | bbed42d3287dcbb47fadf1ed926dfdfe5fb3d93f (diff) | |
| download | Ishtar-add9f73b4b2f2c1c82548b89ab30f37fdf9ae9c2.tar.bz2 Ishtar-add9f73b4b2f2c1c82548b89ab30f37fdf9ae9c2.zip | |
Merge branch 'v0.9' into wheezy
| -rw-r--r-- | archaeological_finds/migrations/0002_auto__add_findbasket__add_unique_findbasket_label_user.py (renamed from archaeological_finds/migrations/0045_auto__add_findbasket__add_unique_findbasket_label_user.py) | 2 | ||||
| -rw-r--r-- | version.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/archaeological_finds/migrations/0045_auto__add_findbasket__add_unique_findbasket_label_user.py b/archaeological_finds/migrations/0002_auto__add_findbasket__add_unique_findbasket_label_user.py index 2879e422a..591a10518 100644 --- a/archaeological_finds/migrations/0045_auto__add_findbasket__add_unique_findbasket_label_user.py +++ b/archaeological_finds/migrations/0002_auto__add_findbasket__add_unique_findbasket_label_user.py @@ -292,7 +292,7 @@ class Migration(SchemaMigration): 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'items': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['archaeological_finds.Find']", 'null': 'True', 'blank': 'True'}), + 'items': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'basket'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['archaeological_finds.Find']"}), 'label': ('django.db.models.fields.CharField', [], {'max_length': '1000'}), 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.IshtarUser']", 'null': 'True', 'blank': 'True'}) }, diff --git a/version.py b/version.py index d79d0ecc5..347018f69 100644 --- a/version.py +++ b/version.py @@ -1,4 +1,4 @@ -VERSION = (0, 94) +VERSION = (0, 94, 1) def get_version(): |