啥都壞了
Revert "結合po文與文章列表"

This reverts commit e98f81f7ad7630ee5c13f879ddae02ae4a0a6114.

Conflicts:
	db.sqlite3
	posts/models.py
	posts/urls.py
asdas

fasfasaf
Revert "結合po文與文章列表"

This reverts commit e98f81f7ad7630ee5c13f879ddae02ae4a0a6114.

Conflicts:
	db.sqlite3
	posts/models.py
	posts/urls.py
乾~~~~
Revert "乾~~~~"

This reverts commit 4c11cffa6310387983d7a67a7586333fbf29a4ec.
Revert "Revert "結合po文與文章列表""

This reverts commit 0682b0f73612ceed4342a53a502e365a86ede4cb.
現在這個我這裡是好的
好的
TAG好了
我忘記這是啥了
??
profile快動
Merge remote-tracking branch 'origin/TingYu'sBranch'

Conflicts:
	db.sqlite3
	posts/admin.py
profile
main_base test
main
可用但醜醜的編輯個人資訊
超醜但可用的編輯資訊

帳密請用jean 111
Merge remote-tracking branch 'origin/master' into TingYu'sBranch