OSDN Git Service

conflict
[pettanr/pettanr.git] / app / assets / javascripts / manifest / model /
2015-04-25 yasushiitoMerge branch 'v06' of git.sourceforge.jp:/gitroot/petta...
2015-04-23 yasushiitofix:new elm
2015-04-12 yasushiitofix: cache
2015-04-09 yasushiitooperator move to cache
2015-03-20 yasushiitoMerge branch 'v06' of git.sourceforge.jp:/gitroot/petta...
2015-03-20 yasushiitochange: picker
2014-12-21 yasushiitoMerge branch 'v06' of git.sourceforge.jp:/gitroot/petta...
2014-12-16 yasushiitofix select item translation
2014-12-01 yasushiitoclean
2014-11-28 yasushiitoMerge branch 'v06' of git.sourceforge.jp:/gitroot/petta...
2014-11-28 yasushiitoadd editor event
2014-11-04 yasushiitoMerge branch 'v06' of git.sourceforge.jp:/gitroot/petta...
2014-11-02 yasushiitorename model name
2014-10-31 yasushiitorename model name
2014-09-25 yasushiitoMerge branch 'v06' of git.sourceforge.jp:/gitroot/petta...
2014-09-24 yasushiitoadd panel viewer
2014-08-24 yasushiitofix filer index
2014-07-17 yasushiitoMerge branch 'v06' of git.sourceforge.jp:/gitroot/petta...
2014-07-11 yasushiitoMerge branch 'v06' of git.sourceforge.jp:/gitroot/petta...
2014-07-11 yasushiitoadd js
2014-07-02 yasushiitofix ap
2014-06-28 yasushiitofix js manifest