1. 06 Jan, 2015 1 commit
  2. 08 Sep, 2014 2 commits
  3. 03 Sep, 2014 4 commits
  4. 21 Jul, 2014 12 commits
  5. 18 Apr, 2014 1 commit
  6. 31 Mar, 2014 1 commit
  7. 29 Mar, 2014 2 commits
  8. 17 Mar, 2014 4 commits
  9. 04 Mar, 2014 2 commits
  10. 03 Mar, 2014 5 commits
  11. 01 Mar, 2014 4 commits
  12. 25 Feb, 2014 2 commits
    • Jan Lippert's avatar
      Merge branch 'develop' · e4e9d737
      Jan Lippert authored
      Conflicts:
      	gradle/wrapper/gradle-wrapper.properties
      	src/main/res/layout/card_meeting.xml
      	src/main/res/layout/fragment_news_details.xml
      e4e9d737
    • Jan Lippert's avatar
      Merge remote-tracking branch 'origin/master' · b43c6d43
      Jan Lippert authored
      Conflicts:
      	fsdroid/AndroidManifest.xml
      	fsdroid/src/de/upb/fsmi/fragments/NewsFragment.java
      	fsdroid/src/de/upb/fsmi/fragments/OverviewFragment.java
      b43c6d43