Merge branch 'feature/sync' into develop

Conflicts: omniNotes/build.gradle
mrblackfree · Oct 15, 2014 · d8ac903 · d8ac903
1 parent 3a2a264
commit d8ac903
Show file tree

Hide file tree

Showing 30 changed files with 3,080 additions and 2,555 deletions.
diff --git a/omniNotes/src/main/AndroidManifest.xml b/omniNotes/src/main/AndroidManifest.xml
@@ -275,7 +275,7 @@
         </service>
 
         <service
-            android:name=".extensions.PushBulletExtension"
+            android:name="it.feio.android.omninotes.extensions.PushBulletExtension"
             android:permission="com.pushbullet.android.permission.READ_MESSAGING_EXTENSION_DATA">
             <intent-filter>
                 <action android:name="com.pushbullet.android.extension.MessagingExtension" />