Gavriil Sitnikov a4a0e0d4b8 Merge branch 'feature/general_improvements' into master-rx-java-2 ... # Conflicts: # src/main/java/ru/touchin/roboswag/components/adapters/BindableViewHolder.java # src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java # src/main/java/ru/touchin/roboswag/components/navigation/ViewController.java # src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java # src/main/java/ru/touchin/roboswag/components/utils/BaseLifecycleBindable.java		2017-04-20 19:54:12 +03:00
..
java/ru/touchin/roboswag/components	Merge branch 'feature/general_improvements' into master-rx-java-2	2017-04-20 19:54:12 +03:00
res	common resources added	2017-01-13 17:06:12 +03:00
AndroidManifest.xml	package changed	2016-02-18 21:47:17 +03:00