Revision ca4ff8f0
| ID | ca4ff8f0edb8c548b6cbe5465992af1a15f4775d |
| Parent | 52e2496b, ae4f02b4 |
| Child | 75926c16 |
Merge branch 'master' into secureshare
Conflicts:
app/AndroidManifest.xml
app/assets/story/templates/ar/simple/essay_simple.json
app/assets/story/templates/ar/simple/photo_simple.json
app/assets/story/templates/ar/simple/video_simple.json
app/assets/story/templates/de/simple/essay_simple.json
app/assets/story/templates/es/simple/essay_simple.json
app/assets/story/templates/fr/simple/essay_simple.json
app/assets/story/templates/mk/simple/essay_simple.json
app/assets/story/templates/mk/simple/photo_simple.json
app/assets/story/templates/mk/simple/video_simple.json
app/assets/story/templates/sr/simple/audio_simple.json
app/assets/story/templates/sr/simple/essay_simple.json
app/assets/story/templates/sr/simple/photo_simple.json
app/assets/story/templates/sr/simple/video_simple.json
app/res/values-ar/strings.xml
app/res/values-de/strings.xml
app/res/values-es/arrays.xml
app/res/values-es/strings.xml
app/res/values-fa/strings.xml
app/res/values-fr/strings.xml
app/res/values-ko/arrays.xml
app/res/values-mk/arrays.xml
app/src/info/guardianproject/mrapp/PublishFragment.java
app/src/info/guardianproject/mrapp/SceneEditorActivity.java
app/src/info/guardianproject/mrapp/db/StoryMakerDB.java
app/src/info/guardianproject/mrapp/model/Table.java
Files
- added
- modified
- copied
- renamed
- deleted