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
..
adapters	Merge branch 'feature/general_improvements' into master-rx-java-2	2017-04-20 19:54:12 +03:00
navigation	adapter delegate logic finished	2017-04-20 18:26:49 +03:00
utils	adapter delegate logic finished	2017-04-20 18:26:49 +03:00
views	Merge branch 'master' into new_storable	2017-03-09 01:59:47 +03:00