5 Commits (83b7b8cd9c8a2b9c63b30911c3c4e27095cf15aa)

Author SHA1 Message Date
  jasder 8d300e11f9 FIX [bug]conflicts file for pull api 5 years ago
  jasder b7dd12927b ADD conflicts file for pull api 5 years ago
  jasder 62b99c517e Update deploy doc 5 years ago
  Jasder d7e0431606 Upate database.yml.example 5 years ago
  Jasder 2937b2a94d init project 6 years ago