Permalink
Switch branches/tags
Nothing to show
Commits on Sep 15, 2018
  1. XML 수정

    purplebeen committed Sep 15, 2018
  2. 진짜 끝

    purplebeen committed Sep 15, 2018
  3. 돌렸으면 돌렸다고

    wjdtmddnr24 committed Sep 15, 2018
  4. 룰렛 끝

    wjdtmddnr24 committed Sep 15, 2018
  5. workout design

    PPPosik committed Sep 15, 2018
  6. 하이

    wjdtmddnr24 committed Sep 15, 2018
  7. Merge branch 'master' of https://github.com/purplebeen/NeverEndingNig…

    wjdtmddnr24 committed Sep 15, 2018
    …htmare
    
    # Conflicts:
    #	.idea/caches/build_file_checksums.ser
  8. wjdtmddnr24 committed Sep 15, 2018
  9. icon

    PPPosik committed Sep 15, 2018
  10. Merge branch 'master' of https://github.com/purplebeen/NeverEndingNig…

    PPPosik committed Sep 15, 2018
    …htmare
    
    # Conflicts:
    #	app/src/main/res/layout/activity_moneysend.xml
    #	app/src/main/res/layout/activity_work_out.xml
  11. send receive page

    PPPosik committed Sep 15, 2018
  12. send 적용 및 수정

    purplebeen committed Sep 15, 2018
  13. 욕하지마렴

    wjdtmddnr24 committed Sep 15, 2018
  14. 돈 받는 기능 추가

    purplebeen committed Sep 15, 2018
  15. Merge branch 'master' of https://github.com/purplebeen/NeverEndingNig…

    PPPosik committed Sep 15, 2018
    …htmare
    
    # Conflicts:
    #	app/src/main/java/com/example/baehyeonbin/neverending_nightmare/SplashActivity.kt
  16. splash

    PPPosik committed Sep 15, 2018
  17. 사운드 들려요

    wjdtmddnr24 committed Sep 15, 2018
  18. log page

    PPPosik committed Sep 15, 2018
  19. button

    PPPosik committed Sep 15, 2018
  20. Merge remote-tracking branch 'origin/master'

    purplebeen committed Sep 15, 2018
    # Conflicts:
    #	.idea/caches/build_file_checksums.ser
  21. firebase setting

    purplebeen committed Sep 15, 2018