From 9ade2849547ee5114aceffb5edc6c551b8192a68 Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <jeffrey.freeman@syncleus.com>
Date: Mon, 12 Feb 2018 00:12:34 -0500
Subject: [PATCH] Updated changelog. Bumped version to 3.3.0.

---
 CHANGELOG.md | 15 ++++++++++-----
 crowdin.yml  |  6 ------
 pom.xml      |  4 +---
 3 files changed, 11 insertions(+), 14 deletions(-)
 delete mode 100644 crowdin.yml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f0eb4be..391065a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Ferma Changelog
 
-## 3.2.2
+## 3.3.0
+
+* Added support for properties with mulitiple values for annotated property getters.
+* An adjacency getter (annotated) will now return null instead of an exception if no elements present.
+* Setters now take null as a valid argument.
+* Fixed a bug that caused exceptions in the case of a vertex property with a cardinality other than single.
 
 ## 3.2.1
 
@@ -25,7 +30,7 @@
   method.
 * Getter methods annotated with the `@Adjacency` annotation can now return a `List` or a `Set` in addition to the usual
   `Iterator` return type.
-* Setter methods annotated with the `@Adjacency` annotation can now accept `Iterable` parameters such as `Collection`, 
+* Setter methods annotated with the `@Adjacency` annotation can now accept `Iterable` parameters such as `Collection`,
   `List`, or `Set` in addition to the usual `Iterator` type.
 * Remove methods annotated with the `@Adjacency` annotation can now have no parameters and they will remove all edges
   matching the specified label and direction.
@@ -50,12 +55,12 @@
 ## 3.1.0
 
 * Added abstraction code for tinkerpop transactions which ease usage of transactions within ferma.
-  The new code provides functional interfaces for transactions and methods which allow 
+  The new code provides functional interfaces for transactions and methods which allow
   access to transactions from nested functions without the need to pass the original transaction object along.
-  Once a transaction has been opened it can be accessed from anywhere within the same thread 
+  Once a transaction has been opened it can be accessed from anywhere within the same thread
   via the `Tx.getActive()` method.
 
-  The `TxFactoryTest` class and the [ferma-orientdb extension](https://github.com/syncleus/ferma-orientdb) 
+  The `TxFactoryTest` class and the [ferma-orientdb extension](https://github.com/syncleus/ferma-orientdb)
   contain examples how these classes and methods can be used.
 
 * Updated the following dependencies
diff --git a/crowdin.yml b/crowdin.yml
deleted file mode 100644
index b8500f36..00000000
--- a/crowdin.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-files:
-  - source: /docs
-    translation: /%two_letters_code%/%original_file_name%
-    languages_mapping:
-      two_letters_code:
-        en: docs
diff --git a/pom.xml b/pom.xml
index 2e824e89..beea7a89 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <groupId>com.syncleus.ferma</groupId>
     <artifactId>ferma</artifactId>
     <packaging>jar</packaging>
-    <version>3.2.2-SNAPSHOT</version>
+    <version>3.3.0-SNAPSHOT</version>
 
     <prerequisites>
         <maven>3.0.4</maven>
@@ -289,5 +289,3 @@
         </profile>
     </profiles>
 </project>
- 
- 
-- 
GitLab