Merge branch 'master' of https://github.com/kamalber/fly-project.git

Conflicts: src/main/resources/static/js/app/app.js
kamalber · May 30, 2017 · b5332ed · b5332ed
2 parents aab2ada + 2682187
commit b5332ed
Show file tree

Hide file tree

Showing 8 changed files with 7,690 additions and 290 deletions.
diff --git a/pom.xml b/pom.xml
@@ -109,6 +109,14 @@
   <version>6.0</version>  
   </dependency>
 
+
+<!-- https://mvnrepository.com/artifact/org.twitter4j/twitter4j-core -->
+<dependency>
+    <groupId>org.twitter4j</groupId>
+    <artifactId>twitter4j-core</artifactId>
+    <version>4.0.2</version>
+</dependency>
+
 <dependency>
    <groupId>org.json</groupId>
    <artifactId>json</artifactId>